This reverts commit 3460516d209f1eb621973ece3fac5b2013fd8c1c. Change-Id: I8a7fb9c32ef5d2cab7df9d851de47574a2db8900