This reverts commit 95ada5ab896b4ed77a4c720790ea4d0fe2781f0d. Change-Id: Ifc436bbf1b05912a33d6805322659ee994dd6477