This reverts commit dec4688f40. Change-Id: Ief869dec1641d5a376bc044719941536e0bf8442
dec4688f40
25c5296b