This reverts commit 2b0bcfaf83. It wasn't reviewed. Reviewed-by: Rich Salz <rsalz@openssl.org>
2b0bcfaf83