diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java
index a439dff2d..83352b5bc 100644
--- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java
+++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java
@@ -196,12 +196,6 @@ public enum Mixins implements IMixins {
         )
     ),
 
-    IRIS_ACCESSORS(new MixinBuilder()
-        .setPhase(Phase.EARLY)
-        .setApplyIf(() -> AngelicaConfig.enableIris)
-        .addClientMixins("shaders.accessors.MixinEntityRenderer")
-    ),
-
     ANGELICA_TEXTURE(new MixinBuilder()
         .setPhase(Phase.EARLY)
         .setApplyIf(() -> AngelicaConfig.enableIris || AngelicaConfig.enableSodium)
diff --git a/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java b/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java
index 4a848be1d..f45d33989 100644
--- a/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java
+++ b/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java
@@ -4,6 +4,7 @@ import java.awt.image.BufferedImage;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.potion.Potion;
@@ -83,9 +84,8 @@ public final class Lightmap {
     }
 
     private float getNightVisionStrength(EntityRenderer renderer, float n) {
-
         if (Minecraft.getMinecraft().thePlayer.isPotionActive(Potion.nightVision)) {
-            return renderer.getNightVisionBrightness(Minecraft.getMinecraft().thePlayer, n);
+            return ((EntityRendererAccessor) renderer).invokeGetNightVisionBrightness(Minecraft.getMinecraft().thePlayer, n);
         }
         return 0.0f;
     }
diff --git a/src/main/resources/META-INF/mcpatcherforge_at.cfg b/src/main/resources/META-INF/mcpatcherforge_at.cfg
index aa7eb7ba5..6fc39f8a3 100644
--- a/src/main/resources/META-INF/mcpatcherforge_at.cfg
+++ b/src/main/resources/META-INF/mcpatcherforge_at.cfg
@@ -16,4 +16,3 @@ public net.minecraft.potion.PotionHelper field_77925_n # field_77925_n PotionCol
 public net.minecraft.client.renderer.texture.TextureAtlasSprite <init>(Ljava.lang.String;)V # constuctor
 public net.minecraft.entity.projectile.EntityPotion field_70197_d # potionDamage
 public net.minecraft.client.resources.SimpleResource field_110533_b # srResourceLocation
-public net.minecraft.client.renderer.EntityRenderer func_82830_a(Lnet/minecraft/entity/player/EntityPlayer;F)F # getNightVisionBrightness
diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java
index 5d2f8e469..8ac588a44 100644
--- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java
+++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java
@@ -1,17 +1,24 @@
 package com.gtnewhorizons.angelica.mixins.early.angelica;
 
+import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
 import com.gtnewhorizons.angelica.rendering.RenderingState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(EntityRenderer.class)
-public abstract class MixinEntityRenderer {
+public abstract class MixinEntityRenderer implements EntityRendererAccessor {
+
+    @Invoker
+    public abstract float invokeGetNightVisionBrightness(EntityPlayer entityPlayer, float partialTicks);
+
     @Inject(method = "setupCameraTransform", at = @At(value = "TAIL"))
     private void angelica$captureCameraMatrix(float partialTicks, int startTime, CallbackInfo ci) {
         final Minecraft mc = Minecraft.getMinecraft();
diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/accessors/MixinEntityRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/accessors/MixinEntityRenderer.java
deleted file mode 100644
index 8c813bbd3..000000000
--- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/accessors/MixinEntityRenderer.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.gtnewhorizons.angelica.mixins.early.shaders.accessors;
-
-import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.entity.player.EntityPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(EntityRenderer.class)
-public abstract class MixinEntityRenderer implements EntityRendererAccessor  {
-    @Invoker
-    public abstract float invokeGetNightVisionBrightness(EntityPlayer entityPlayer, float partialTicks);
-
-}