Dart 24275

Closes #20790.

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