Revert "Make globals use sharedCAF"