diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
index 1ca4f76848..545c35109f 100644
--- a/system/docs/CHANGELOG.md
+++ b/system/docs/CHANGELOG.md
@@ -5,10 +5,10 @@ Version 3.3.6 (2014-XX-XX)
 --------------------------
 
 ### Fixed
-Consider the `useSSL` flag of the root page when generating URLs (see #7390).
+Do not generally remove insert tags from page titles (see #7198).
 
 ### Fixed
-Remove insert tags from page titles in the navigation menu (see #7198).
+Consider the `useSSL` flag of the root page when generating URLs (see #7390).
 
 ### Fixed
 Correctly create the template object in `BaseTemplate::insert()` (see #7366).
diff --git a/system/modules/core/models/PageModel.php b/system/modules/core/models/PageModel.php
index 94ce9eb11f..b9acca6623 100644
--- a/system/modules/core/models/PageModel.php
+++ b/system/modules/core/models/PageModel.php
@@ -585,15 +585,6 @@ public function loadDetails()
 
 		$this->trail = array_reverse($trail);
 
-		// Remove insert tags from all titles (see #2853)
-		$this->title = strip_insert_tags($this->title);
-		$this->pageTitle = strip_insert_tags($this->pageTitle);
-		$this->parentTitle = strip_insert_tags($this->parentTitle);
-		$this->parentPageTitle = strip_insert_tags($this->parentPageTitle);
-		$this->mainTitle = strip_insert_tags($this->mainTitle);
-		$this->mainPageTitle = strip_insert_tags($this->mainPageTitle);
-		$this->rootTitle = strip_insert_tags($this->rootTitle);
-
 		// Do not cache protected pages
 		if ($this->protected)
 		{
diff --git a/system/modules/core/modules/Module.php b/system/modules/core/modules/Module.php
index 4f55527462..145de800ef 100644
--- a/system/modules/core/modules/Module.php
+++ b/system/modules/core/modules/Module.php
@@ -343,10 +343,6 @@ protected function renderNavigation($pid, $level=1, $host=null, $language=null)
 					$row['isActive'] = false;
 				}
 
-				// Remove insert tags from all titles (see #2853, #7198)
-				$objSubpages->title = strip_insert_tags($objSubpages->title);
-				$objSubpages->pageTitle = strip_insert_tags($objSubpages->pageTitle);
-
 				$row['subitems'] = $subitems;
 				$row['class'] = trim($strClass);
 				$row['title'] = specialchars($objSubpages->title, true);
diff --git a/system/modules/core/pages/PageRegular.php b/system/modules/core/pages/PageRegular.php
index fc7b3f7b39..a0b9133ca3 100644
--- a/system/modules/core/pages/PageRegular.php
+++ b/system/modules/core/pages/PageRegular.php
@@ -174,7 +174,7 @@ public function generate($objPage, $blnCheckRequest=false)
 		}
 
 		// Assign the title and description
-		$this->Template->title = $this->replaceInsertTags($objLayout->titleTag); // see #7097
+		$this->Template->title = strip_insert_tags($this->replaceInsertTags($objLayout->titleTag)); // see #7097
 		$this->Template->description = str_replace(array("\n", "\r", '"'), array(' ' , '', ''), $objPage->description);
 
 		// Body onload and body classes