am 170977f3: Revert "Add robustness against vendor dependencies"

* commit '170977f3baf6e8fbe01eb523894adbbfc8c4c23b':
  Revert "Add robustness against vendor dependencies"