Index: parser/ParserCache.php
===================================================================
--- parser/ParserCache.php	(revision 99633)
+++ parser/ParserCache.php	(working copy)
@@ -181,7 +181,11 @@
 		// The edit section preference may not be the appropiate one in 
 		// the ParserOutput, as we are not storing it in the parsercache 
 		// key. Force it here. See bug 31445.
-		$value->setEditSectionTokens( $popts->getEditSection() );
+		if ( $value->getProperty( "noeditsection" ) !== false ) {
+			$value->setEditSectionTokens( 0 );
+		} else {
+			$value->setEditSectionTokens( $popts->getEditSection() );
+		}
 
 		if ( !$useOutdated && $value->expired( $touched ) ) {
 			wfIncrStats( "pcache_miss_expired" );