Merge "Revert "base: work around thread safety analysis bug.""