Revert "Merge remote-tracking branch 'origin/cc1.6' into develop"

This reverts commit 89012247858db1745baf599330817e5920a6416f, reversing
changes made to 8dcac80986ee2e05551233d99a7801c0320ec9b2.