Revert "Toggle Button Commit"

This reverts commit f98eb67bba752785b11c4cf13c8b789936d18a87, reversing
changes made to 94614b451cebd7032fbfb21e9ec3ef5f48d4aaf5.