This reverts commit 199b1b09. As requested by TSC Chair Change-Id: I0f3b7c3d9dfdde805b6edcd7fb7cc83e40819cad