This reverts commit a3d762913482f2deb6c59220e87c52b686d1b4fa. Needs co-ordination with google3 changes.