Back out bug 588237, patches 2 through 5.