This reverts commit 842d44ec1765e01f4a37af99cc1935b4d0399758. Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187