Merge "There are several painful issues with the initial CL. Doing a revert for now and will rework this."