And a changelog entry for Nick's change