CAMEL-6673 revert the change