Reverting "don't use reference catalog to resolve uid"