[PATCH v2] Refactor ResetSystem() requirements