This reverts commit 552abb2a4668184de6652292443b9cfca0ed97ea. Change-Id: Ia7b4951e589365a5ecf3b57836a355763b981368