--- a/pp/common_option.cpp
+++ b/pp/common_option.cpp
@@ -58,7 +58,6 @@
 };
 
 int session_dir_supplied;
-int trying_default_session_dir;
 
 double handle_threshold(string threshold)
 {
@@ -180,20 +179,15 @@
 	if (options::session_dir.empty()) {
 		char * cwd;
 		struct stat sb;
-		// First try <curr_dir>/oprofile_data session-dir (i.e., used by operf)
+		// If <curr_dir>/oprofile_data exists (used by operf), we'll use that as session-dir
 		cwd = new char[PATH_MAX];
 		options::session_dir = (getcwd(cwd, PATH_MAX) == NULL) ? "" : cwd;
 		delete [] cwd;
 		options::session_dir +="/oprofile_data";
 		if ((stat(options::session_dir.c_str(), &sb) < 0) ||
 				((sb.st_mode & S_IFMT) != S_IFDIR)) {
-			// Try the standard default session dir instead
+			// Use the standard default session dir instead
 			options::session_dir = "/var/lib/oprofile";
-			trying_default_session_dir = 1;
-		} else {
-			// OK, we'll try <cur_dir>/oprofile_data first; then, if we don't find
-			// any samples there, we'll also try the default session dir /var/lib/oprofile.
-			trying_default_session_dir = 0;
 		}
 		session_dir_supplied = 0;
 	} else {
@@ -320,18 +314,6 @@
 	return merge_by;
 }
 
-int try_another_session_dir(void)
-{
-	if (!session_dir_supplied && !trying_default_session_dir) {
-		trying_default_session_dir = 1;
-		options::session_dir = "/var/lib/oprofile";
-		init_op_config_dirs(options::session_dir.c_str());
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
 bool was_session_dir_supplied(void)
 {
 	return session_dir_supplied;