In 5c826806 the checks are relaxed,
but this commit (or part of) was not brought into 4.1.

Fixes: #1842