I don't think this is needed now? It's causing problems for the test suite.