This reverts commit 43635ca3f7. Change-Id: I328f7e0add71c54cc4806810f784732ff17a16bb
43635ca3f7
0c26c32