Revert "Merge remote-tracking branch 'origin/async'"

This reverts commit 51a7e6a3ef6a9a00fe7c943fa3a2a8b14ea957e4, reversing
changes made to 973830e9fcb8e030cd16ad387d5490a61f381f7c.