Ooops... remove code accidentally commited from FIPS version.
Ooops... remove code accidentally commited from FIPS version.

openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl,openssl/openssl