Revert "Merge branch 'master' of https://github.com/mmanske/Vamu"

This reverts commit 02bc31b5b26bea3703ebcb57c4016276b9582620, reversing
changes made to 2d327e313b36055fa228ffdae8ebda2d5e5bde3c.