remove encode_decode hack