dart 20444

Closes #18730.

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