Remove stupid hack for encoding