Reverted DIC changes since cannot use $this in a static class method.