Revert "Use patches from current versions for new binaries"

This reverts commit 00635c51876b3ef727a9800e06cdf8134fad7a7c.