The diff is quite small. I'll have a reviewboard up later tonight