Comment 135 for bug 113201

Created an attachment (id=311399)
resolve non-blocking, and if we block defer until later

biesi pointed me in this direction. I'm spinning a try server build shortly, and writing tests, just throwing it up here for now.