Updated one preferred patch that no longer applies cleanly to latest master.