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

This reverts commit 233672ec2a6f15e2de12a4f0eed73d77bd94427e.