Revert "Commit of various live hacks"

This reverts commit 3d6851f66257d5df117688b51b7f3037c8ab6aaf.

Change-Id: I26c418d631047783ba945e6b6a7f707d876b3146