bug 1025335 - move to scl3; r=bhearsum