CAMEL-7010 reverted the changes which should not be committed