diff --git a/control/Director.php b/control/Director.php
index cab2d598c..d67442359 100644
--- a/control/Director.php
+++ b/control/Director.php
@@ -148,17 +148,6 @@ class Director implements TemplateGlobalProvider {
 						number_format(memory_get_peak_usage(),0)
 					));
 				} else {
-					// Set content length (according to RFC2616)
-					if(
-						!headers_sent()
-						&& $response->getBody() 
-						&& $req->httpMethod() != 'HEAD' 
-						&& $response->getStatusCode() >= 200
-						&& !in_array($response->getStatusCode(), array(204, 304))
-					) {
-						$response->fixContentLength();
-					}
-
 					$response->output();
 				}
 			} else {
diff --git a/control/HTTPResponse.php b/control/HTTPResponse.php
index 1a0a38c06..447da3c40 100644
--- a/control/HTTPResponse.php
+++ b/control/HTTPResponse.php
@@ -150,6 +150,9 @@ class SS_HTTPResponse {
 	
 	public function setBody($body) {
 		$this->body = $body;
+		
+		// Set content-length in bytes. Use mbstring to avoid problems with mb_internal_encoding() and mbstring.func_overload
+		$this->headers['Content-Length'] = mb_strlen($this->body,'8bit');
 	}
 	
 	public function getBody() {
@@ -252,14 +255,6 @@ class SS_HTTPResponse {
 	public function isFinished() {
 		return in_array($this->statusCode, array(301, 302, 401, 403));
 	}
-
-	/**
-	 * Set content-length in bytes. Should be called right before {@link output()}.
-	 */
-	public function fixContentLength() {
-		// Use mbstring to avoid problems with mb_internal_encoding() and mbstring.func_overload
-		$this->headers['Content-Length'] = mb_strlen($this->body,'8bit');	
-	}
 	
 }
 
diff --git a/tests/control/HTTPResponseTest.php b/tests/control/HTTPResponseTest.php
index 69675c19d..f2f37c693 100644
--- a/tests/control/HTTPResponseTest.php
+++ b/tests/control/HTTPResponseTest.php
@@ -15,7 +15,6 @@ class HTTPResponseTest extends SapphireTest {
 	
 	public function testContentLengthHeader() {
 		$r = new SS_HTTPResponse('123ü');
-		$r->fixContentLength();
 		$this->assertNotNull($r->getHeader('Content-Length'), 'Content-length header is added');
 		$this->assertEquals(
 			5, 
@@ -24,7 +23,6 @@ class HTTPResponseTest extends SapphireTest {
 		);
 		
 		$r->setBody('1234ü');
-		$r->fixContentLength();
 		$this->assertEquals(
 			6, 
 			$r->getHeader('Content-Length'),