https://issues.apache.org/activemq/browse/AMQ-2594 - reverting related https://issues.apache.org/activemq/browse/AMQ-2563 changes, as more refactoring is needed