Remove @Singleton annotations (#374) - 2.0 hotfix

Backport of #608 to the 2.0 release series, addressing #374.