1b481e1973
This reverts commit 7943b35a71.
Reason for revert: Seems to be breaking flicker tests b/295447665, will verify before submitting. This change could be WAI (or surfacing issues)
Change-Id: Ic240c29539f41490cf7232bd6a7a944a868f3870