Hipkins Puts Three Waters Back on the Table