Revert "don't add RequestHandler to waitgroup"

This reverts commit 6f584f55bcc76f5af7f45f1fcaf86333d68dc754.