--- a/src/octave.cc	Tue Feb 02 17:47:23 2010 -0500
+++ b/src/octave.cc	Wed Feb 03 03:07:06 2010 -0500
@@ -335,9 +335,7 @@
 	      // We want to check for curr_dir after executing home_rc
 	      // because doing that may change the working directory.
 
-	      std::string curr_dir = octave_env::getcwd ();
-
-	      local_rc = octave_env::make_absolute (initfile, curr_dir);
+	      local_rc = octave_env::make_absolute (initfile);
 
 	      home_rc_already_executed = same_file (home_rc, local_rc);
 	    }
@@ -346,11 +344,7 @@
       if (! home_rc_already_executed)
 	{
 	  if (local_rc.empty ())
-	    {
-	      std::string curr_dir = octave_env::getcwd ();
-
-	      local_rc = octave_env::make_absolute (initfile, curr_dir);
-	    }
+            local_rc = octave_env::make_absolute (initfile);
 
 	  source_file (local_rc, context, verbose, require_file);
 	}