This reverts commit 00245473db. Change-Id: If078c09fbdfd00d005ff58d543f03601b96eef0a
00245473db
bffd6fcb
b535c5e2