Revert "Fix ESBJAVA-3211"
Merge pull request #116 from wso2-dev/revert-99-master

Revert "Fix ESBJAVA-3211"