CRM-18163, removed code that explicitly set org id using org name