Hmm.. there are quite a few tests in test_common.py which fail if I do that change.