Revert "Misc Backports from CAF-3.4"

This reverts commit ec8a9ae788d2a2f5f1bed70bd195b2ba451b8d42.