Dart follow-up to #1528.
Dart follow-up to #1528.