Removed the EncodingConstraints hack - previous commit does it a better way