This reverts commit 27b4c8cc859b92046bb61b7abbd216d9be8a2762. Change-Id: I01eb5253157cf526ea6bd145d1f6eee0ae073b35