Remove obsolete patch.
Remove optimiser changes.