McCain now says Western water pact should stand