Please don't move stuff around in patches like this; it makes them hard to read.