Revert "Hack out some CLA bits."

This reverts commit 5662d3b39716d399b162ef9bd248f02992e7ea0a

Change-Id: I710ace4fdc549c3d81f2a2124bc53fc4704e4af7