Revert "Merge pull request #455 from thomd/html-snippet"

This reverts commit 6dde955798e409ac6a288d333089dbe308fa3c9d, reversing
changes made to c1bc3da7af7b1834691c8f5a7335440bcd4b2262.
Merge branch 'new'