CRM-10128, reverting first commit