This reverts commit 22419568. Reason for revert: 177065099 Change-Id: Id47cc94591eefbc276f77ae8601bb6d52cfa2f63