Dart 23799

Closes #20411.

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