This reverts commit 29af96c4486c1baf8601482e54e6886139f49546. Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d