Revert "Messing with selects"

This reverts commit 6f3c341ac9433f3e472e6100567617746a29c853.