INT-2934 start again

For further details see
- https://jira.springsource.org/browse/INT-2934
- https://jira.springsource.org/browse/INT-2931