![auto-submit[bot]](/assets/img/avatar_default.png)
Reverts: flutter/flutter#146931 Initiated by: Hixie Reason for reverting: more failures Original PR Author: Hixie Reviewed By: {reidbaker} This change reverts the following previous change: Fixes #137555. This is an updated version of https://github.com/flutter/flutter/pull/146856, which was reverted in https://github.com/flutter/flutter/pull/146927. The first commit is identical to the original PR, and subsequent commits are the fixes to address failures detected in devicelab post-commit.