"Fix ESBJAVA-3211"

Reverts wso2-dev/wso2-synapse#116