This is to assist in updating upstream, as the current file patch system is brittle and fails to handle conflicts well.