SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/By.java‎
Lines changed: 4 additions & 0 deletions b/‎java/client/src/org/openqa/selenium/By.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎java/client/src/org/openqa/selenium/support/locators/RelativeLocator.java‎
Lines changed: 1 addition & 20 deletions b/‎java/client/src/org/openqa/selenium/support/locators/RelativeLocator.java‎
Lines changed: 1 addition & 20 deletions
@@ -135,6 +135,10 @@ public WebElement findElement(SearchContext context) {
   public abstract List<WebElement> findElements(SearchContext context);
 
   protected WebDriver getWebDriver(SearchContext context) {
+    if (context instanceof WebDriver) {
+      return (WebDriver) context;
+    }
+
     if (!(context instanceof WrapsDriver)) {
       throw new IllegalArgumentException("Context does not wrap a webdriver: " + context);
     }
 
@@ -23,9 +23,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.SearchContext;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.WrapsDriver;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.json.JsonException;
@@ -205,7 +203,7 @@ private RelativeBy near(Object locator, int atMostDistanceInPixels) {
 
     @Override
     public List<WebElement> findElements(SearchContext context) {
-      JavascriptExecutor js = extractJsExecutor(context);
+      JavascriptExecutor js = getJavascriptExecutor(context);
 
       @SuppressWarnings("unchecked")
       List<WebElement> elements = (List<WebElement>) js.executeScript(FIND_ELEMENTS, asAtomLocatorParameter(this));
@@ -230,23 +228,6 @@ private List<Map<String, Object>> amend(Map<String, Object> toAdd) {
         .build();
     }
 
-    private JavascriptExecutor extractJsExecutor(SearchContext context) {
-      if (context instanceof JavascriptExecutor) {
-        return (JavascriptExecutor) context;
-      }
-
-      Object current = context;
-      while (current instanceof WrapsDriver) {
-        WebDriver driver = ((WrapsDriver) context).getWrappedDriver();
-        if (driver instanceof JavascriptExecutor) {
-          return (JavascriptExecutor) driver;
-        }
-        current = driver;
-      }
-
-      throw new IllegalArgumentException("Cannot find elements, since the context cannot execute JS: " + context);
-    }
-
     @Override
     public Parameters getRemoteParameters() {
       return new Parameters(