Revert patch for DATASET-1025 here, it's been implemented in trunk.