Revert old reverts due to CLA not signed

The CLA had to be signed. It wasn't, yet. Now that it is, reverting the older reverts.