Revert "Fix async bug"

This reverts commit 92f908b7b6f1c1384bbce0b51c012e60e8db3e42.
Revert "Revert "Fix async bug""

This reverts commit f70676c1f14f927dc6727039a84faf571a9f17c8.