diff --git a/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
new file mode 100644
index 0000000000..fb262caf2c
--- /dev/null
+++ b/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -0,0 +1,52 @@
+From f8db7aba46387296b47ecd7f5773798094843e0b Mon Sep 17 00:00:00 2001
+From: Hugo Manrique <hugmanrique@gmail.com>
+Date: Mon, 23 Jul 2018 12:57:39 +0200
+Subject: [PATCH] Option to prevent armor stands from doing entity lookups
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index a8470e6e..f33cd90d 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -350,6 +350,11 @@ public class PaperWorldConfig {
+         }
+     }
+ 
++    public boolean armorStandEntityLookups = true;
++    private void armorStandEntityLookups() {
++        armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
++    }
++
+     public int maxCollisionsPerEntity;
+     private void maxEntityCollision() {
+         maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 127dcedc..72e22c09 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -11,6 +11,7 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Random;
+ import java.util.UUID;
++
+ import java.util.function.Function;
+ import java.util.function.Predicate;
+ import java.util.function.Supplier;
+@@ -1562,6 +1563,14 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+         }
+     }
+ 
++    // Paper start - Prevent armor stands from doing entity lookups
++    @Override
++    public boolean getCubes(@Nullable Entity entity, AxisAlignedBB axisAlignedBB) {
++        if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return false;
++        return GeneratorAccess.super.getCubes(entity, axisAlignedBB);
++    }
++    // Paper end
++
+     public boolean a(AxisAlignedBB axisalignedbb) {
+         int i = MathHelper.floor(axisalignedbb.a);
+         int j = MathHelper.f(axisalignedbb.d);
+-- 
+2.18.0.windows.1
+
diff --git a/removed/server/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/removed/server/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
deleted file mode 100644
index c127bbc613..0000000000
--- a/removed/server/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a3aaaa3233ac457ef6bc4c1373429c28bc66524a Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 21 Dec 2016 11:52:04 -0600
-Subject: [PATCH] Option to prevent armor stands from doing entity lookups
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2ba3bcb8e..5f06d4e5e 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -408,4 +408,9 @@ public class PaperWorldConfig {
-             log("Treasure Maps will return already discovered locations");
-         }
-     }
-+
-+    public boolean armorStandEntityLookups = true;
-+    private void armorStandEntityLookups() {
-+        armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 424b956e8..b85c55168 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess {
- 
-         this.a(entity, axisalignedbb, false, arraylist);
-         if (entity != null) {
-+            if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return arraylist; // Paper
-             List list = this.getEntities(entity, axisalignedbb.g(0.25D));
- 
-             for (int i = 0; i < list.size(); ++i) {
--- 
-2.18.0
-