Bug 988486 - Followup to fix build errors on non-theadsafe builds r=jandem