diff --git a/Misc/NEWS b/Misc/NEWS
index 8e6a0494e8d..1757bffab72 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,6 +58,8 @@ What's New in Python 2.5.1?
 Core and builtins
 -----------------
 
+- Bug #1722484: remove docstrings again when running with -OO.
+
 - Revert SF #1615701: dict.update() does *not* call __getitem__() or keys()
   if subclassed.  This is to remain consistent with 2.5.
   Also revert revision 53667 with made a similar change to set.update().
diff --git a/Python/compile.c b/Python/compile.c
index e493beb6c2f..5ac17029524 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1779,7 +1779,8 @@ compiler_body(struct compiler *c, asdl_seq *stmts)
 	if (!asdl_seq_LEN(stmts))
 		return 1;
 	st = (stmt_ty)asdl_seq_GET(stmts, 0);
-	if (compiler_isdocstring(st)) {
+	if (compiler_isdocstring(st) && Py_OptimizeFlag < 2) {
+		/* don't generate docstrings if -OO */
 		i = 1;
 		VISIT(c, expr, st->v.Expr.value);
 		if (!compiler_nameop(c, __doc__, Store))