patch issue #783393005 from the dart repo