dart 26639

Closes #22261.

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