This is still needed for running unit tests, but just in one place. We
can remove it everywhere else.