This reverts commit 3380dd5169d25cb49abe4b9f00540fd8f7347da2. Change-Id: I78dc93766b8d2d3a93b734857d7636e122b9ff78