diff --git a/doc/contributions.txt b/doc/contributions.txt
index 089f7a4ed9..18017c773d 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -272,6 +272,7 @@ Beq Janus
 	SL-13583
 	SL-14766
 	SL-14927
+	SL-16021
 Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 80d45d6fb3..133dc9ea3c 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -581,14 +581,9 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 	}
 	LLVOAvatar::AvatarOverallAppearance oa = avatarp->getOverallAppearance();
 	BOOL impostor = !LLPipeline::sImpostorRender && avatarp->isImpostor();
-	// <FS:Beq> plain old impostors are passing through the shadow pipeline
-	// if (oa == LLVOAvatar::AOA_INVISIBLE ||
-	// 	(impostor && oa == LLVOAvatar::AOA_JELLYDOLL))
-	// Note: Impostors should not cast shadows, also all JDs are impostor nowadays so we do not need the extra check at all.
-	if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE) )
-	// </FS:Beq>
+	if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE))
 	{
-		// No shadows for jellydolled or invisible avs.
+		// No shadows for impostored (including jellydolled) or invisible avs.
 		return;
 	}