This reverts commit 17f8b638. The new version breaks Pandoc, curiously enough. Who would have thought? Everyone seems to be going Snoyman these days.