This reverts commit 4ecd1e4732. Note: This patch is not needed anymore because the problem was fixed upstream!
4ecd1e4732