Revert "Improvements to Guice injections."

This reverts commit 832eac279acd57aafc1518b73024064371a649f9.