This reverts commit dec4688f40b0018fbd1f00db05581966f531d88f. Change-Id: Ief869dec1641d5a376bc044719941536e0bf8442