Revert third-party fix for lack of CLA #650