Revert "Upstream merged PRs"
Merge pull request #14 from openshift/revert-12-origin_all_containers

Revert "Upstream merged PRs"