This reverts commit c597c55ffeb9debcf2dba8a77a80caa9016ea4d1. Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68