Remove dependency on EntryAssembly - doesn't work in tests, and maybe we want to control that