This reverts commit b1186b0b. As requested by TSC Chair Change-Id: I811ceec9e7d458b9a528f131cf44c2807f45efb2