r21387: Another important fix for non-AD domains: