Revert r16325, apparently it makes things worse than before.
Revert r16325, apparently it makes things worse than before.

r16343

krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate,krosenvold/selenium-git-release-candidate