Workaround no longer needed.
https://jira.springsource.org/browse/SPR-10930 is fixed.