The upstream fix is: https://github.com/dart-lang/usage/commit/021664efd35d563ee21eadbed40af6b5e8e23b2e
