https://jira.springsource.org/browse/INT-3187

We can just fix it in the 4.0.0-WIP branch the next time we merge master into it.