Reverted Selector code #215

#215
Merge pull request #1140 from ptariche/patch-20

Reverted Selector code #215