Fork of Google Guice for issue-807