Reinstate the two-part async code again so that we can debug it properly.