Fix 4.3 merge derp