This reverts commit c40608c041b1eb8b8cb4b96347c7ca29f4f79169. Change-Id: Ia202f4b48b8ba22497db8aa97ba53d412f7b7bd5