Fix #5199

Fix #5199. The removed lines will correct the selector.

More changes may follow as there may be quirkiness-es.