I didn't remember that when I posted the article, but after you mention it, that does ring a bell. I believe Michael Hayden (although I wouldn't wager a large sum of money) said something to that effect. It will be interesting to see if there's any clarification on this.
I personally couldn't care less that they water boarded KSM, or anyone else. Water boarding may be against the Geneva convention, but so is the intentional target of civilians. In war you act the way you wish to be treated. We water board - they behead. It's not even a close call for me.