Revert "Refactors async waterfall"

This reverts commit 0616e78ca3eb7bc1902b21f111905412802adc7a.