Crossing into Canada & back - what about on-board water?

I've read up on what you can bring into Canada and back into the USA.

Simple question - what about the on-water in the tanks? Do I need to dump all the Canadian water before returning into the USA? Do I need to dump all the 'Merican water before entering Canada?