Revert "Fix selector syntax"

This reverts commit ece51a6676b2ab61b9ca0fc76daf29750db25c90

See Imre's comment on https://review.openstack.org/#/c/37473/
Merge "Revert "Fix selector syntax""