Calib: Linear ratios converge better for uncalibrated gains

This reverts commit 3c3bdc2d5ecaf47bbbee8bd1796730277c5eb677.