diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index 7be70a30fa7ba2..be4b0409131eea 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -451,11 +451,6 @@ private TestProvider initializeTestProvider(FilesToRunProvider filesToRunProvide
         && ruleContext.getRule().isAttributeValueExplicitlySpecified("shard_count")) {
       ruleContext.attributeError("shard_count", "Must not be negative.");
     }
-    if (explicitShardCount > 50) {
-      ruleContext.attributeError("shard_count",
-          "Having more than 50 shards is indicative of poor test organization. "
-          + "Please reduce the number of shards.");
-    }
     TestActionBuilder testActionBuilder =
         new TestActionBuilder(ruleContext)
             .setInstrumentedFiles(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetTest.java
index 57224994a8e231..eedeead42991e2 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetTest.java
@@ -536,16 +536,6 @@ public void testNegativeShardCount() throws Exception {
         "foo_test(name='bar', srcs=['mockingbird.sh'], shard_count=-1)");
   }
 
-  @Test
-  public void testExcessiveShardCount() throws Exception {
-    checkError(
-        "foo",
-        "bar",
-        "indicative of poor test organization",
-        "load('//test_defs:foo_test.bzl', 'foo_test')",
-        "foo_test(name='bar', srcs=['mockingbird.sh'], shard_count=51)");
-  }
-
   @Test
   public void testNonexistingTargetErrorMsg() throws Exception {
     checkError("foo", "foo", getErrorNonExistingTarget(