[Orgmode] Issue with correctly resuming interrupted timer

[Benjamin Beckwith]

I have an issue with my particular setup when using org-capture.  Here
is my relevant capture template:

(setq org-capture-templates
      '(("t" "todo" entry
         (file "~/Documents/Org/Refile.org")
         "* TODO %?\n  %U\n  %a" :clock-in t :clock-resume t))

I have all tasks go to the file Refile.org as shown above.  They are
are first-level TODOs. Say I have a list of tasks such as

* TODO A (Currently clocked in)
* TODO B
* TODO C

Also let the point be on the task B line.  Now if I call org-capture
and store a task, B become the task that get clocked in after
completing the capture.  Which gives me:

* TODO A
* TODO B (Now clocked in)
* TODO C
* TODO New Capture

I believe that the issue is within org-capture-finalize and the call
to org-with-point-at, but I have exceeded my elisp debugging skills
and need help.

I am using the very latest org-mode master with emacs 23.1 on windows.
 Any ideas?