Revert "Fix for CRM failure"