Updated to work with Dart version 0.8.10.10_r30107