This reverts commit 9595c560a3d8360c61a14a2427af4342ed81fbb9. Change-Id: I804b9ae0505b5f6088ec9cb9a9cb44fcd2c10da3