Re #10031. Revert changes to Fit