Revert "Use injection instead"

This reverts commit efe4b14305a05a8406a9e955e01e45791c12391f.