This reverts commit 1138991893.
1138991893
Drop patches that have since been applied. Create new patches as needed.