This reverts commit a46836bb744d4d166fd7e73b10071d3f4ebf28a8. Change-Id: I62e28ed1b9a7b564d0b95204475aa601b91c116e