71a594f681
This reverts commit f6a6385b42.
Does not work as expected, and does not fix the real issue
which is still not understood.