diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index 807f994156..9ba3e9311a 100644
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -86,11 +86,12 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir)
 
 	no_app_nap ();
 
-	if (!g_getenv ("ARDOUR_BUNDLED")) {
-		return;
+	if (g_getenv ("ARDOUR_SELF")) {
+		g_setenv ("ARDOUR_SELF", argv[0]);
+	}
+	if (g_getenv ("PREBUNDLE_ENV")) {
+		EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
 	}
-
-	EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
 
 	set_language_preference ();