Update according to Dart r21094