Remove previously deprecated behaviour
Fix wrong changelog entry