Update ChangeLog and revert cosmetic changes