fixes 5310

I was incorrect in my initial review of 5310, this class is meant to do more than just css selectors.