I suspect we don't need this anymore. If we need it for testing, perhaps move it into a testing class.