Work around for dart_lang/#1758. (#1762)

2 files changed