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

This reverts commit a82bd3cf721e32272b2cf3dee3aa1afcc726c3cb.
2 files changed