- Move async catches back to where they were (#6869)