Fix v2 ERB processing

Fix ERB processing by reverting a portion of this commit:

https://github.com/openshift/origin-server/pull/1837/files#diff-13