Fixed the fix to #1154.

We need to strip off up to 4 spaces, not up to 3.
Updated changelog.