anchor.diff:              '(${request.query.limit}) was.');
         }
   
  +
  +      // FIXME: TODO: Big hack!
  +      // It looks like Apiary/Atlas is currently broken.
  +      /*
         if (limit != null &&
             returnedEntities.length < batchLimit &&
             response.batch.moreResults == 'MORE_RESULTS_AFTER_LIMIT') {
  
positive.code: }
  
  class DatastoreImpl implements datastore.Datastore {
    final api.DatastoreApi _api;
    final String _project;
  
  
negative.code:         remainingEntities = limit - returnedEntities.length;
        }
  
        // If the server signals there are more entities and we either have no
        // limit or our limit has not been reached, we set `moreBatches` to
        // `true`.
        bool moreBatches =
            (remainingEntities == null || remainingEntities > 0) &&
            response.batch.moreResults == 'MORE_RESULTS_AFTER_LIMIT';
  
        bool gotAll = limit != null && remainingEntities == 0;
        bool noMore = response.batch.moreResults == 'NO_MORE_RESULTS';
        bool isLast = gotAll || noMore;
  
        // As a sanity check, we assert that `moreBatches XOR isLast`.
        assert (isLast != moreBatches);
  
        // FIXME: TODO: Big hack!
        // It looks like Apiary/Atlas is currently broken.
        if (moreBatches && returnedEntities.length == 0) {
          print('Warning: Api to Google Cloud Datastore returned bogus response. '
                'Trying a workaround.');
          isLast = true;
          moreBatches = false;
        }
  
        if (!isLast && response.batch.endCursor == null) {
          throw new datastore.DatastoreError(
  