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

This reverts commit e4509da961057b94bc42e71d8dcd948cae261ba8.

Reason for revert: probably breaks checkbuild?

Change-Id: I04a6284dee82761c90fa355da0472855a228b849
1 file changed