Revert "On-The-Go mode [2/2]"

This reverts commit ca438e5e79b6d060d8f1fc9805a5affbafa7d0a2.