This reverts commit cf00459308. Reason for revert: regression fixed by ag/27951019 Flag: EXEMPT bugfix Change-Id: Ie537feb738744f96417227e6271d4873b43b0c1d
cf00459308