I don't see this point of this. They are all sync calls, now we made then async anyway? Maybe this should be left as it is...