manually applying appium commit f1961181bc