CLC-2887 Rolling back more task-related rails changes