Revert "Merge branch 'master' of https://github.com/Laurasmus/SIBW3"

This reverts commit 129edc1af89565a984ee62ba6a9abd4817ae5258, reversing
changes made to a19378ebed3f95fa39eb58084e228ab3bdd04a1a.