Almost. The excessive CLA had to go too (or be replaced by a DCO).

CLAs may have a place, but as long as they hadn't planned on a bait and switch all along they wouldn't need a CLA literally copied from Oracle's playbook.