Re-adding changes to Surface::intersect.  I am not sure how these were lost, hopefully we can figure this out in case it happened to other files too.

[#54850586]