So changing this causes a bunch of errors to come up for me in the test suite:
http://pastebin.mozilla.org/2217960