Our necessary custom changes will be reapplied in later commits for clarity, and saved as patches for future updates.
Same rationale as the previous commits.