Reverts 99ba79ed, which is not needed any more and causes trouble now See !508
mentioned in issue #1567 (closed)
mentioned in commit 3dd99293
mentioned in commit 7cfe663b