Remove changelog entry of reverted change
Fix another text wrap issue (added test case)