Didn't touch this code. Marked for post 1.8 review.