This reverts commit f636ffaf. This reverts commit 2c15755e. I'm having a very hard time finding out what is causing compilation issues, and I think it's best to start over again.