Bug 785905 followup - Fix --disable-threadsafe shell builds.