Revert "Changes for Selenium Grid"

This reverts commit 669afa2577405c183aa58a2430c5d815603bc418.