Refs #6704  Reverted heuristic to preMantid value
Merge branch 'bug/6704_revertHeuristic' into develop