No, it can't be null, but this isn't part of my changes. I wanted to get rid of this too, but in a separate CL.