Revert "refactor hand over to deal with multiple asynchronous requests better"

This reverts commit 7a2e3ef97b68a24f5c88a70a374fd738904f7909.