This reverts commit ef8eb5c9dd45cc94219d6e889d026f53ecc5c7e9. Change-Id: I6c473d09eae8289da1deb86a8f043aa88de4c6f0