Unreviewed. Fix WebDriver tests after r235225.