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

This reverts commit 871df2411a9ba6981378e2778b858afef289199b.