Revert "Enhance the Easy Selector"

This reverts commit caa8dabf3802aaff9dbb8d374214a0a6ddbfde15.