diff --git a/gramps.sh.in b/gramps.sh.in
index 60f5f0d91..d80158720 100644
--- a/gramps.sh.in
+++ b/gramps.sh.in
@@ -25,4 +25,4 @@ PACKAGE=@PACKAGE@
 
 export GRAMPSDIR=@datadir@/@PACKAGE@
 
-exec @PYTHON@ -O $GRAMPSDIR/gramps.py "$@"
+exec @PYTHON@ $GRAMPSDIR/gramps.py "$@"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 460362767..d959ca489 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -360,12 +360,12 @@ src/plugins/tool/ChangeNames.py
 src/plugins/tool/ChangeTypes.py
 src/plugins/tool/Check.py
 src/plugins/tool/Desbrowser.py
-src/plugins/tool/Eval.py
+#src/plugins/tool/Eval.py -- commented out due to bug #2763
 src/plugins/tool/EventCmp.py
 src/plugins/tool/EventNames.py
 src/plugins/tool/ExtractCity.py
 src/plugins/tool/FindDupes.py
-src/plugins/tool/Leak.py
+#src/plugins/tool/Leak.py -- commented out due to bug #2763
 src/plugins/tool/MediaManager.py
 src/plugins/tool/NotRelated.py
 src/plugins/tool/OwnerEditor.py
@@ -786,10 +786,10 @@ src/plugins/book.glade
 src/plugins/tool/changenames.glade
 src/plugins/tool/changetype.glade
 src/plugins/tool/desbrowse.glade
-src/plugins/tool/eval.glade
+#src/plugins/tool/eval.glade -- commented out due to bug #2763
 src/plugins/tool/eventcmp.glade
 src/plugins/import/ImportGedcom.glade
-src/plugins/tool/leak.glade
+#src/plugins/tool/leak.glade -- commented out due to bug #2763
 src/plugins/tool/merge.glade
 src/plugins/tool/ownereditor.glade
 src/plugins/tool/patchnames.glade
diff --git a/src/plugins/tool/Makefile.am b/src/plugins/tool/Makefile.am
index ff1b79f97..253e9ba55 100644
--- a/src/plugins/tool/Makefile.am
+++ b/src/plugins/tool/Makefile.am
@@ -11,12 +11,10 @@ pkgdata_PYTHON = \
 	ChangeTypes.py \
 	Check.py \
 	Desbrowser.py \
-	Eval.py \
 	EventCmp.py \
 	EventNames.py \
 	ExtractCity.py \
 	FindDupes.py \
-	Leak.py \
 	MediaManager.py \
 	NotRelated.py \
 	OwnerEditor.py \
@@ -29,6 +27,8 @@ pkgdata_PYTHON = \
 	SortEvents.py \
 	SoundGen.py \
 	Verify.py
+#	Eval.py \   -- commented out due to bug #2763
+#	Leak.py \   -- commented out due to bug #2763
 #	CmdRef.py \
 #	DumpGenderStats.py \
 #	PHPGedViewConnector.py \