I put it there because it's only used in HttpKernel, but now that you mention it... I think I should move it.