Why did we move this out of its own file. It was much better there if we want to make use of it conditional on play version.