Revert "Fix for: https://issues.apache.org/jira/browse/AMQ-4947"

This reverts commit c50b6c39babb9e0c4265e632aabf9c38f69c6730.