Revert of r106939

Change-Id: Ife8dc2bef670f99f62e075e4e763e4ed9ab76009