That's what I use. Aged water - 1 gallon with half a teaspoon of salt, 1/2 gallon plain aged water and 1 gallon of treated water to get the temperature up to where it was in the dirty tank.
I thought both... there is something in the water that stays even after it is aged. Chloramine? I don't remember. But you do need conditioner no matter what.