Revert "Upstream merged PRs"

Reverts openshift/kubernetes#12