REVERT: Revert fix 3510c0a560e48d19adfcc673c4b78ed8633acf40 because there is a better one.
REVERT: Revert fix 3510c0a560e48d19adfcc673c4b78ed8633acf40 because there
is a better one.

koryonik/swipl-devel,jn7163/swipl-devel,edechter/swipl-devel,jn7163/swipl-devel,koryonik/swipl-devel,mndrix/swipl-devel,mndrix/swipl-devel,mndrix/swipl-devel,koryonik/swipl-devel,jn7163/swipl-devel,edechter/swipl-devel,mndrix/swipl-devel,edechter/swipl-devel,koryonik/swipl-devel,koryonik/swipl-devel,jn7163/swipl-devel,jn7163/swipl-devel,mndrix/swipl-devel,edechter/swipl-devel,edechter/swipl-devel