Dart 22611

Closes #19780.

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