Bug 428193 - Reorganize Guice injection