Revert "Revert "Remove looking for dependency""

This reverts commit a3c381cc385c9818e80455b8b59a52c51772bfa9.