Revert unwanted header boilerplate change.
Removed unwanted additions to ChangeLog, so ChangeLog remains identical to the one found on trunk.