Back out bug fix for [Bug 2893771], because it was the cause of the regression.