Backed out changeset 1961d66863c5

This change stretches too far for bug26075.