Revert "Merge branch 'master' of https://github.com/manuelep/ultimus"

This reverts commit 8f73f2d86a350db53c64a7e711e391dc92f2394f, reversing
changes made to c394efe9faac935a87b9fdd7c71237bd7ed7b022.