Trying out David's fix

https://github.com/dturanski/spring-xd/commit/6b62d242c3a2bcf572e741aa0ea3f2915af13508