diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index c3bf5cc2..88fd8086 100755
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -1378,16 +1378,12 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 			$this->URLSegment = $segment;
 		}
 		
-		DataObject::set_context_obj($this);
-		
 		// Ensure that this object has a non-conflicting URLSegment value.
 		$count = 2;
 		while(!$this->validURLSegment()) {
 			$this->URLSegment = preg_replace('/-[0-9]+$/', null, $this->URLSegment) . '-' . $count;
 			$count++;
 		}
-		
-		DataObject::set_context_obj(null);
 
 		$this->syncLinkTracking();