diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 88245a1531..79ae6d1b61 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1084,11 +1084,7 @@ public class CraftWorld implements World {
         int blockY = block.getY();
         int blockZ = block.getZ();
         // following code is lifted from Explosion.a(boolean), and modified
-        int data = block.getData();
-        if (blockId == net.minecraft.server.Block.SKULL.id) {
-            data = net.minecraft.server.Block.SKULL.getDropData(this.world, blockX, blockY, blockZ);
-        }
-        net.minecraft.server.Block.byId[blockId].dropNaturally(this.world, blockX, blockY, blockZ, data, yield, 0);
+        net.minecraft.server.Block.byId[blockId].dropNaturally(this.world, blockX, blockY, blockZ, block.getData(), yield, 0);
         block.setType(org.bukkit.Material.AIR);
         // not sure what this does, seems to have something to do with the 'base' material of a block.
         // For example, WOODEN_STAIRS does something with WOOD in this method
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index b1eb4fc6ac..7f7a7fc5e8 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -348,10 +348,6 @@ public class CraftBlock implements Block {
         boolean result = false;
 
         if (block != null) {
-            if (block.id == net.minecraft.server.Block.SKULL.id) {
-                data = (byte) block.getDropData(chunk.getHandle().world, x, y, z);
-            }
-
             block.dropNaturally(chunk.getHandle().world, x, y, z, data, 1.0F, 0);
             result = true;
         }