Doh, ignore me, I didn't read the complete diff.