Merge "Revert "Commit of various live hacks""