Dart 22659

Closes #19825.

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