This reverts commit 71fd0fab. All Zelenium tests are failing because of this change. Revert until all tests are fixed.