This reverts commit e995111c. Change-Id: Ib06e04b8162a8443d426f06699953cf0dea63022
mentioned in commit 9e72deba
mentioned in commit cd1a1581