This reverts commit fba71ad4. Looks like it fails on linux. I have to investigate the problem, meanwhile I revert