Revert "Merge pull request #977 from nicolasgarnier/jekyll-2-support"

This reverts commit c781715ecde63d2787dcd89e5a6732f5c7c59a88, reversing
changes made to 53d92a0637f4cf892d11bc4d2abcacb385bdcd10.

(The above was auto-generated by git.)

This reverts #977, which I believe caused #988.