Revert "On-The-Go: make it multiuser aware"

This reverts commit 5130b31f3e953239a478d4fd307417ac67ca13b2.