This reverts commit 3c2529c717cda3df321c1d0d6abe23ac1f298ac9. Change-Id: I37d4ea6c1079d337ede7ac567d88414a41fc1e11