Revert "Add On-The-Go Toggle [2/2]"

This reverts commit 71b0c93cb7c133817b61b41d249eb105a1ba5bda.