Dart 21823

Closes #19369.

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