This patch just moves code, so it should not affect our behavior at all. MozReview-Commit-ID: 4yxSR5rWUV1