Revert "Crappy hack for dependency issues"

This reverts commit a43e5129080b2cb6ae4fb55d369b22253548e782.