Revert "proposed changes more inline with DI philosophy"

This reverts commit 85adf0dfd0e514c914c61178855eb2280b8e4267.