Revert "More copyright cleanups"

This reverts commit f1738b9b9219ffa78bb57fdedc703590abaf5ac2.
reverted f0f16505e5c3468b9cc598abd797f0aa650447a6