Doh! Forget to revert this change. I've changed my mind since. This issue should be addressed here: https://jira.springsource.org/browse/INT-2585