HotFix for #27

Pretty much everything we can do on our end until the Dart team gets that looked at.