This reverts commit c7ded40e566be6849a980e2b0dad1c698cbe0848. Change-Id: I169f57704623c6ac79c45d7f1666fa5f8a840522