This reverts commit 59e9d889. As requested by TSC chair Change-Id: I9ec74f1498e9eb0aabac1a41cbb4477cbc930f0d
mentioned in commit e47b913f