Revert "An easy way to handle the selected|highlighted and selected|disabled control states"

This reverts commit 29fad55c20719baf8c32c237ba1f9f6680c4f4ec.