This reverts commit 60b96502b39d221afb43ff7e8a49a19a2fb3c2e0. Change-Id: Ie1c2ee4c983c4d6b0c086f252a191b3c60e50b9c