This reverts commit 1db3d860ca. Reverting due to a few critical bugs and unit test failures. Change-Id: I5e2d02300320438ef9c29577ec5b0860ea91d822
1db3d860ca