Dart 21548

Closes #19259.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>