Update to work with org-html 8.2.5h

It seems in latest version of org available on package site reverts previous changes.