This reverts commit ec6bc41e18. Bug 26842512 Change-Id: I9fc775d21081885d0e26fca4ade412a18da45b7c
ec6bc41e18