Revert "Merge branch 'master' of github.com:serps/trojita"

This reverts commit fd005ccf93a7bfdf330a6e4d0e8f892eb5f8bdae, reversing
changes made to 00aa9da6af5a3864a3e97b5591cf9aece252234a.