This reverts commit c53ae9b462. It's just a temporary work-around until someone finds a real fix.
c53ae9b462