This reverts commit 5dcc74ac1c25e0a01b21ce6eb7cb7e6b54a6ef11. Change-Id: Id4c0d8371678825f244b05978b8a29a3ec3892e3