Revert "[1/2][SQUASHED] Base: On-The-Go mode"

This reverts commit 07b2774f6ca007c5bea4c7bae70755e438105f9f.