Revert "Commit of various live hacks"

This reverts commit c6af934ae65b8c7dbd878a376f9e46dc28bff941.

Change-Id: I3e863bb632531d7cd4ec0614325a7c4a7ba9aa3d