If you do an "advanced" pwnage rather than simple, you can disable the image replacement when you make the custom firmware. Personally, I don't like it either, but I'll leave it there until 2.0.1 comes out and I have to customise that one, rather than re-doing everything for the sake of one image.