dart 20193

Closes #18591.

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