Oops, partial revert of 5ba86251c08ea9a9297afd2c1d8f57adaecc3d03

Change-Id: I180aa42ff2d97bad921603c20a0834aa3315526b