This reverts commit cc242de3
That patch fixed bug 2745, but breaks tests 1.89 and 1.91 on
typical Xeon processors