Dart 24160

Closes #20613.

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