diff --git a/OpenRA.Mods.Cnc/TiberiumRefinery.cs b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
index 500067f61c..adae4d95c2 100644
--- a/OpenRA.Mods.Cnc/TiberiumRefinery.cs
+++ b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -34,14 +34,6 @@ namespace OpenRA.Mods.Cnc
 		public TiberiumRefinery(Actor self)
 		{
 			this.self = self;
-			self.World.AddFrameEndTask(
-				w =>
-				{		/* create the free harvester! */
-					var harvester = w.CreateActor("harv", self.Location + new int2(0, 2), self.Owner);
-					var unit = harvester.traits.Get<Unit>();
-					unit.Facing = 64;
-					harvester.QueueActivity(new Harvest());
-				});
 		}
 
 		public int2 DeliverOffset {	get { return new int2(0, 2); } }
diff --git a/mods/cnc/structures.yaml b/mods/cnc/structures.yaml
index e797df7fe6..7244ee41fd 100644
--- a/mods/cnc/structures.yaml
+++ b/mods/cnc/structures.yaml
@@ -62,6 +62,11 @@ PROC:
 		Capacity: 1000
 	CustomSellValue:
 		Value: 600
+	HasUnitOnBuild:
+		Unit: HARV
+		InitialActivity: Harvest
+		SpawnOffset: 1,2
+		Facing: 64
 		
 SILO:
 	Inherits: ^Building