Revert "Merge pull request #4 from greenrd/master"

These are wiki-dependent things actually

This reverts commit f4d4fd79ffc3debf8c3c5c5f53a3323f56e21355, reversing
changes made to 1e51733552a1a48a5247dd17bf09dcd77e7d3fae.