Revert the revert.

Revert "Revert "t554 - Making sure selectors exist before applying validation rules""

This reverts commit 54553982573e702f0b0d1b7197578711ba2db8bb.