Revert to simpler version that doesn't use StructureMap