DaveHunt: Restoring fix for issue 2826 that was reverted in r16190.
DaveHunt: Restoring fix for issue 2826 that was reverted in r16190.

r16278

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