This reverts commit 54fdd559d8. Trying to reland this after https://dart-review.googlesource.com/c/sdk/+/115364 hopefully fixes the issue leading to the revert. Change-Id: If3c49bea9d791aa3d569003490c1cbe8b325f2e1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/115705 Commit-Queue: Sarah Zakarias <zarah@google.com> Reviewed-by: Clement Skau <cskau@google.com>
54fdd559d8