TRT has reverted the following PR because it caused a payload rejection:
https://github.com/openshift/origin/pull/27368

Additional information is in TRT-495.

When unreverting this change, please also search the release repository for references, such as this list of test skips:
https://github.com/openshift/release/blob/031c233818f7911be6b10ad058aadd5ff3ad1885/ci-operator/config/openshift/router/openshift-router-master.yaml#L106

Additionally origin has annotations that prevent certain tests from running in various environments, these should be updated as well:
https://github.com/openshift/origin/blob/master/test/extended/util/annotate/rules.go