Revert "DI only once"

This reverts commit 9b3cd1a73bac31bc656a7092349452515a12c28a.