182ff2d0 didn't help, still fails with the same error. This reverts commit 182ff2d0. This reverts commit 53274b1a.
mentioned in commit bbdc712a