(I should have tested the last change a bit more before submitting). R=rsc http://go/go-review/1017011
