You can revert these changes.  I just pushed a change that should make this unnecessary

https://code.google.com/p/selenium/source/detail?r=d84a49c4e2a3