This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55. Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01