diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
index 1386531353005..32044989044a6 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
@@ -117,20 +117,19 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
           leftKeys, rightKeys, buildSide, planLater(left), planLater(right))
         condition.map(Filter(_, hashJoin)).getOrElse(hashJoin) :: Nil
 
+      case ExtractEquiJoinKeys(
+             LeftOuter, leftKeys, rightKeys, condition, left, CanBroadcast(right)) =>
+        joins.BroadcastHashOuterJoin(
+          leftKeys, rightKeys, LeftOuter, condition, planLater(left), planLater(right)) :: Nil
+
+      case ExtractEquiJoinKeys(
+             RightOuter, leftKeys, rightKeys, condition, CanBroadcast(left), right) =>
+        joins.BroadcastHashOuterJoin(
+          leftKeys, rightKeys, RightOuter, condition, planLater(left), planLater(right)) :: Nil
+
       case ExtractEquiJoinKeys(joinType, leftKeys, rightKeys, condition, left, right) =>
-        joinType match {
-          case LeftOuter if sqlContext.conf.autoBroadcastJoinThreshold > 0 &&
-            right.statistics.sizeInBytes <= sqlContext.conf.autoBroadcastJoinThreshold =>
-            joins.BroadcastHashOuterJoin(
-              leftKeys, rightKeys, joinType, condition, planLater(left), planLater(right)) :: Nil
-          case RightOuter if sqlContext.conf.autoBroadcastJoinThreshold > 0 &&
-            left.statistics.sizeInBytes <= sqlContext.conf.autoBroadcastJoinThreshold =>
-            joins.BroadcastHashOuterJoin(
-              leftKeys, rightKeys, joinType, condition, planLater(left), planLater(right)) :: Nil
-          case _ =>
-            joins.ShuffledHashOuterJoin(
-              leftKeys, rightKeys, joinType, condition, planLater(left), planLater(right)) :: Nil
-        }
+        joins.ShuffledHashOuterJoin(
+          leftKeys, rightKeys, joinType, condition, planLater(left), planLater(right)) :: Nil
 
       case _ => Nil
     }