Revert "Selector State"

This reverts commit a4f4e608104fa9096211be3fd9e3e0789660aafa, reversing
changes made to 76170edadcd084da729f934c14876e28b9d2d60e.
thread safety