--- /usr/portage/www-client/firefox/firefox-12.0.ebuild	2012-05-03 10:01:29.000000000 +0400
+++ /usr/local/portage/www-client/firefox/firefox-12.0-r9999.ebuild	2012-05-06 20:46:25.316324133 +0400
@@ -96,15 +96,6 @@
 pkg_setup() {
 	moz_pkgsetup
 
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
 	if ! use bindist; then
 		einfo
 		elog "You are enabling official branding. You may not redistribute this build"
@@ -233,6 +224,15 @@
 		# Reset and cleanup environment variables used by GNOME/XDG
 		gnome2_environment_reset
 
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+		unset DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XDG_SESSION_COOKIE \
+			XAUTHORITY
+
 		# Firefox tries to use dri stuff when it's run, see bug 380283
 		shopt -s nullglob
 		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')