Partial revert of 1288f26 and fix for no-async