This reverts commit 63483e17de. Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18
63483e17de
fe24754
d555cd5