Can we just make this async instead of supporting both?  I don't see anywhere that would call this synchronously.