Remove changelog entry of reverted change

Conflicts:

	CHANGELOG
Fix another text wrap issue (added test case)