Revert "Merge branch 'master' of https://github.com/djuta/notre-dame into bronek"

This reverts commit b544c53d9fea0e23de69d3271786916b767425f7, reversing
changes made to 6ea3184822c8c3be6bc38b12d434d333b1ad068f.