This reverts commit d45836eb. Reason for revert: Still breaks tests Bug: 314212435 Change-Id: I35867878c9a8b2aa3d64092a5326c42191569adc