diff --git a/core/util.inc.php b/core/util.inc.php
index 813783e1..870224e8 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -843,8 +843,8 @@ function manual_include($fname) {
 	$text = preg_replace('/@include_once "(.*)";/e', "manual_include('$1')", $text);
 
 	// wibble the defines for HipHop's sake
-	#$text = str_replace('function _d(', '// function _messed_d(', $text);
-	#$text = preg_replace('/_d\(([^,]*), (.*)\);/', 'if(!defined(\1)) define(\1, \2);', $text);
+	$text = str_replace('function _d(', '// function _messed_d(', $text);
+	$text = preg_replace('/_d\("(.*)", (.*)\);/', 'if(!defined("$1")) define("$1", $2);', $text);
 
 	return $text;
 }