Save this to fix for a future date

See issue https://github.com/fontforge/fontforge/pull/461 plus the earlier
https://github.com/fontforge/fontforge/pull/442 (1) for more info.
Merge remote-tracking branch 'upstream/master'
Put it back way it was
Merge pull request #463 from JoesCat/master

Revert last fix, add different fix for -without-x