This reverts commit c0b3a8e3. As requested by TSC Change-Id: Iab49a93c14499ef5ab3cc8d243fc336bc63df977