Make default_selector a fallback rather than an override (#3950) (#4009)

Make default_selector a fallback rather than an override (#3950) (#4009) #1922