I can't actually get my hands on my HS grammar book, which said both uses were acceptable.

However, the link I listed above was one of several I found. (I chose to link to that one for its ease of use and clarity.) Each was backed up by someone whose job it is to teach English, and/or who has published books on English grammar and usage.

I repeat my previous conclusion: a variety of sources make it clear that both usages are correct. Therefore, it is a matter of personal style. And of course, as Annie, Caroline, LabRat, and Wendy all pointed out, the main thing is to use one consistently.

Do you know the most surprising thing about divorce? It doesn't actually kill you, like a bullet to the heart or a head-on car wreck. It should. When someone you've promised to cherish till death do you part says, "I never loved you," it should kill you instantly.

- Under the Tuscan Sun