temporary fix for rhc
Merge pull request #7628 from guardian/rh-adv-tmp-fix

temporary fix for rhc