Revert "Merge branch 'feature-3167' into one-4.8"

This reverts commit fb2a94b890204cc3349b86eed824c2fbbfd0dfad, reversing
changes made to 8f5be2f296af501bcaabbd15e62e9f2a7a5fed19.