... and see what happens.  Hopefully nothing bad since everything should
be thread-safe now.

Change-Id: I333b29bc2066578ccabadb022936a28dafdf7104