making the broker resolve async

this is to accomplish gh-1. We are breaking contracts, but that is fine
since we haven't released a v1 to everybody else.

now that all the hardwork is from an API point of view, let's remove some
of the temporary fixes to get everything operational again