Refs #6704  Reverted heuristic to preMantid value
Merge remote branch 'origin/bug/6704_revertHeuristic'