Revert "On-the-go"

This reverts commit 47cbbde72990d67041008fc8ba89becf6bae976e.