#3827 restored async that was lost in the merge