This reverts commit 8e375913b0. This breaks testing as the PlayContext is not mocked out for the test. Temporarily reverting.
8e375913b0