Revert "de-duplicate container(s) for which dependencies are unresolved"

This reverts commit d52a0ecda0c73e005b109c59e6db1a981620d705.
Fix alphabetical order by adding missing break