CRM-12163

Made an error in the first PR which was merged