This reverts commit 804c0037db88c47ba99eda56f0a8e15b5a5b4b72. Change-Id: I2ffc7f919bd693dca83b987f8252e1ab07de898d