Drop hardening.patch, applied upstream.