733a832fb5
This reverts commit af949c590bd8a00a5973b5875d7e0fa6832ea64a because 889b56c8cd84c9a9f2d9e3b019c154d6f14d9021 fixes the underlying problem. MFC after: 1 month