Reverted Selector code

#215