am fe7eb164: reverting b/559979

* commit 'fe7eb1640b1aca8500b2cab152648a699833d6fd':
  reverting b/559979