Restore synchronous name resolution (revert SVN rev52115).