diff --git a/cib/nagioschecktask.cpp b/cib/nagioschecktask.cpp
index 6be960c70..3a9688c25 100644
--- a/cib/nagioschecktask.cpp
+++ b/cib/nagioschecktask.cpp
@@ -40,10 +40,7 @@ void NagiosCheckTask::ScriptFunc(const ScriptTask::Ptr& task, const vector<Varia
 
 	vector<Dictionary::Ptr> macroDicts;
 	macroDicts.push_back(service.GetMacros());
-	/* TODO: figure out whether we should replicate hosts to checkers,
-	 * for now we just rely on the convenience module to fill in host macros
-	 * for inline service definitions. */
-	//macroDicts.push_back(service.GetHost().GetMacros());
+	macroDicts.push_back(service.GetHost().GetMacros());
 	macroDicts.push_back(IcingaApplication::GetInstance()->GetMacros());
 	string command = MacroProcessor::ResolveMacros(checkCommand, macroDicts);