--- a/build/gecko_templates.mozbuild
+++ b/build/gecko_templates.mozbuild
@@ -21,40 +21,38 @@ def GeckoBinary(linkage='dependent', msv
     ought to be linked: 'static' or 'dynamic'.
 
     `mozglue` indicates whether to link against the mozglue library, and if
     so, what linkage to apply. Valid values are None (mozglue not linked),
     'program' (mozglue linked to an executable program), or 'library' (mozglue
     linked to a shared library).
     '''
     if msvcrt == 'dynamic' or CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['MOZ_ASAN']:
-        xpcomglue = 'xpcomglue'
+        pass
     elif msvcrt == 'static':
         USE_STATIC_LIBS = True
-        xpcomglue = 'xpcomglue_staticruntime'
         if not CONFIG['GNU_CC']:
             mozglue = None
             if linkage == 'dependent':
                 USE_LIBS += [
                     'mozalloc_staticruntime',
                 ]
     else:
         error('msvcrt must be "dynamic" or "static"')
 
     if linkage == 'dependent':
         USE_LIBS += [
             'nspr',
-            '%s_s' % xpcomglue,
             'xul',
         ]
     elif linkage == 'standalone':
         DEFINES['XPCOM_GLUE'] = True
 
         USE_LIBS += [
-            xpcomglue,
+            'xpcomglue',
         ]
     elif linkage != None:
         error('`linkage` must be "dependent", "standalone" or None')
 
     if mozglue:
         LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS']
         if mozglue == 'program':
             USE_LIBS += ['mozglue']