Back out last revision, which broke cerutil -K (with no arguments) in FIPS mode. :(
Back out last revision, which broke cerutil -K (with no arguments) in FIPS mode. :(

ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old