Revert "toggles rewrite WIP"

This reverts commit 7e34118bb2e31f98da7f94665e590f057c720d78.