This reverts commit 4752d357777a165935a726d33f40e5b52439385a. Change-Id: Ie377d6675c901eb922b4e07e800e391805f69361