Backout bug 825959 again, because it still broke compat.