This reverts commit f6d606eb. Reason for revert: broken targets on the internal branch Change-Id: I948280e2072789a2ee20e7fe4844c667f58b5182