dart 25822

Closes #21765.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>