Partial revert of 1288f26f and fix for no-async

The commit 1288f26f

 says that it fixes no-async, but instead seems to break
it. Therefore revert that change and fix no-async.

Reviewed-by: Rich Salz <rsalz@openssl.org>