Revert "Fix derps"

This reverts commit f46746b4e233cff71667e1183d99df909adf05b7.
Revert "Revert "Revert "Squashed On-The-Go mode (1/2)"""

This reverts commit 242406519bc9ac1f0f6bc6e57c66200393346bbf.