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