Minor updates. All parameters of an internal function are for internal use only.
Revert change to visible/hidden selectors until 1.10 and 2.1. Reopens #13132, #10406.
Magic fixing for previous commit