Revert "Revert "Change fitting mode to match previous behaviour.""