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

This reverts commit 649f75dc11ff99c0aca32e5d0980d55685c16994.