Hmm, so I should remove this https://github.com/pyca/cryptography/pull/739/files#diff-29b02d4aae2d31100219792a3077f44fR195 and this https://github.com/pyca/cryptography/pull/739/files#diff-6f70bc256ca254c3f23b03cb7a185bcfR171 then.