Revert commitsb3f3c67eeaanda40d48378dforward ported from 8.0. In 8.0 these commits removed dead code but it is actually useful in saas-6.
Revert commitsb3f3c67eeaanda40d48378dforward ported from 8.0. In 8.0 these commits removed dead code but it is actually useful in saas-6.