[PATCH 1/2] Use a method to reset current_selector (#959707)