Don't use Decoder context to carry information
update to spring 4.1.1.FINAL remove some stale code