Revert "playing with dependency resolution again..."

This reverts commit adc0aa30888730a8faa779662b70dd594b895c7b.