Index: src/AST/Decl.cpp
===================================================================
--- src/AST/Decl.cpp	(revision f5ec35a86ccf3e8ce04ba27d5834c2383512980d)
+++ src/AST/Decl.cpp	(revision 2174191456aa4c76295081b7d612c0840239d69f)
@@ -20,5 +20,4 @@
 #include <unordered_map>
 
-#include "CodeGen/FixMain.h"   // for FixMain
 #include "Common/Eval.h"       // for eval
 
@@ -76,10 +75,4 @@
 	}
 	this->type = ftype;
-	// Hack forcing the function "main" to have Cforall linkage to replace
-	// main even if it is inside an extern "C", and also makes sure the
-	// replacing function is always a C function.
-	if ( name == "main" ) {
-		this->linkage = CodeGen::FixMain::getMainLinkage();
-	}
 }
 
@@ -108,8 +101,4 @@
 	}
 	this->type = type;
-	// See note above about this hack.
-	if ( name == "main" ) {
-		this->linkage = CodeGen::FixMain::getMainLinkage();
-	}
 }