Fix for #1366 - Remove Injector