Removed fork dependencies, moved back to package maintainer's version