WEB-4241 - un-prefer untrusted names when they are untrusted. This is NOT retroactive.