This reverts commit 0e96c086. Some dependencies are still in testing. Sorry for that, I should rather go sleep now.