REVERT CAMEL-5599 (remainder)

just some left over