This needs replacing so we can clean up code in core
This needs replacing so we can clean up code in core