Re-applies #27409 by reverting #27919

The analyzer issue (dart-lang/sdk#35940) has been temporarily
worked around by virtue of #27929