This reverts ae0a9cb5 and therefore relands #69629.

Additionally, `flutter update-packages --force-upgrade` has been run to update `pubspec.yaml` to resolve the analyze test failures.