Revert "org-odt.el: Remove dependency on a pending patch"