
This reverts https://github.com/flutter/flutter/pull/158897 (commit e7a1b6808635464839c556c1a242765210f12df9) as it is intended to be in the same release as https://github.com/flutter/flutter/pull/161275. However, https://github.com/flutter/flutter/pull/161275 had to be reverted and won't be relanded until after the release cutoff. Hence, I'm reverting this as well.