This reverts commit bd7eef17. Bug: 24467386 Bug: 20037935 Change-Id: I04d1d0ffc67661370e4c17911d3b2b105d053bc1