Revert "Use conditional dependencies"