This reverts commit 4f963c1b557010bf453af500b00f36b68988f8e2. Change-Id: I8c7df9d115be1b89b57fb9c9bb2a12b4c1d45520