Revert "solved compilation problems resulting from merge" because Yannick already did it better

This reverts commit 990db66d5f737c58712bea3d1385e9c57ec2b27a.