[cff] Partially revert 401b456
[cff] Partially revert 401b456

See https://github.com/khaledhosny/ots/issues/75

irori/ots,khaledhosny/ots,davelab6/ots,anthrotype/ots,davelab6/ots,irori/ots,anthrotype/ots