It turned out to be a bad idea.

This reverts commits 6891a79d
and c27bc746.
Reviewed-by: NAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3576)