Fix for #639, removing Autofac dependency