Revert "version skew" patches that break FIPS compilation