Revert "Squashed On-The-Go mode (1/2)"

This reverts commit 93f6cfa1cba08abfd1bd05120ccc5245d8cc92c7.