dart 19425

Closes #18392.

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