Addendum to #2136 - remove selectors