Revert the correct funtionality

Refs #10259
Merge branch 'feature/10259_new_calibration_range_calculation' into develop