Yeah, that stuff was already there. This diff sucks.