--- a/process/factory.py
+++ b/process/factory.py
@@ -452,20 +452,16 @@ class MozillaBuildFactory(RequestSorting
         else:
             self.makeCmd = ['make']
 
         if self.signingServers and self.enableSigning:
             self.signing_command = get_signing_cmd(
                 self.signingServers, self.env.get('PYTHON26'))
             self.env['MOZ_SIGN_CMD'] = WithProperties(self.signing_command)
 
-        # Make sure the objdir is specified with an absolute path
-        if 'MOZ_OBJDIR' in self.env and not os.path.isabs(self.env['MOZ_OBJDIR']):
-            self.env['MOZ_OBJDIR'] = '%s/%s' % (self.baseWorkDir, self.env['MOZ_OBJDIR'])
-
         self.addInitialSteps()
 
     def addInitialSteps(self):
         self.addStep(SetProperty(
             name='set_basedir',
             command=['bash', '-c', 'pwd'],
             property='basedir',
             workdir='.',
@@ -2897,17 +2893,17 @@ class BaseRepackFactory(MozillaBuildFact
         self.absMozillaObjDir = '%s/%s/%s' % (
             self.baseWorkDir, self.origSrcDir, self.mozillaObjdir)
 
         self.latestDir = '/pub/mozilla.org/%s' % self.productName + \
                          '/nightly/latest-%s-l10n' % self.branchName
 
         if objdir != '':
             # L10NBASEDIR is relative to MOZ_OBJDIR
-            self.env.update({'MOZ_OBJDIR': self.absObjDir,
+            self.env.update({'MOZ_OBJDIR': objdir,
                              'L10NBASEDIR': '../../l10n'})
 
         if platform == 'macosx64':
             # use "mac" instead of "mac64" for macosx64
             self.env.update({'MOZ_PKG_PLATFORM': 'mac'})
 
         self.uploadEnv = self.env.copy(
         )  # pick up any env variables in our subclass
@@ -3688,24 +3684,19 @@ class SingleSourceFactory(ReleaseFactory
             else:
                 self.mozillaSrcDir = self.origSrcDir
 
         # self.mozillaObjdir is used in SeaMonkey's and Thunderbird's case
         self.objdir = objdir or self.origSrcDir
         self.mozillaObjdir = '%s%s' % (self.objdir, self.mozillaDir)
         self.distDir = "%s/dist" % self.mozillaObjdir
 
-        self.absSrcDir = "%s/%s" % (self.baseWorkDir,
-                                    self.origSrcDir)
-        self.absObjDir = '%s/%s' % (self.absSrcDir,
-                                    self.objdir)
-
         # Make sure MOZ_PKG_PRETTYNAMES is set so that our source package is
         # created in the expected place.
-        self.env['MOZ_OBJDIR'] = self.absObjDir
+        self.env['MOZ_OBJDIR'] = self.objdir
         self.env['MOZ_PKG_PRETTYNAMES'] = '1'
         if appVersion is None or version != appVersion or \
                 (self.branchName == 'mozilla-1.9.2' and productName == 'xulrunner'):
             self.env['MOZ_PKG_VERSION'] = version
         self.env['MOZ_PKG_APPNAME'] = productName
         self.env['no_tooltool'] = "1"
 
         # '-c' is for "release to candidates dir"