removing v2 specific logic
Merge pull request #3419 from danmcp/master

Merged by openshift-bot