This reverts commit 0a720029.
This fails to call ENGINE_finish; an alternate fix is forthcoming.
Reviewed-by: NDr. Stephen Henson <steve@openssl.org>