Revert "Enhance the Easy Selector"

This reverts commit c3eaa317258485f6104125f4e38a161fd57214d8.