This reverts commit 7b8a0026. As requested by TSC chair Change-Id: I3e595462fbb846d658a5c5cd1269e5fe36874e41