Revert a local change and sync. with head. No functional change.

Note this is a direct commit because head has OpenSSL 1.0.2.