This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7. Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f