Reviewed-by: Tim Hudson <tjh@openssl.org>
This reverts commit 927f2e5dea1da17bcc2c3d2baf7258318b57515c.