Revert "https://issues.apache.org/jira/browse/AMQ-3758"

This reverts commit fc244f48e48596c668a7d9dc3b84c26e60693823.