This reverts commit 6bbe485f.


Requested by TSC

Change-Id: I8bf7f51859a472ff47f27c1d3a67dbcb3ca930ec