Found a bug in Org-mode.  Committing to submit.