This reverts commit ce9a9210. As requested by TSC chair Change-Id: I7a8d961628ba36802c17004eb0ccedb602ce95ef
mentioned in commit ed6144d4