RE: Excessive FIPS checks