revert changes for activemq 5.8.0