Rolling back the change due to test fail

Rolled out the changes made for ESBJAVA-3156