Undo re-injection

Changed functionality to what it was before the PR.
I'm not sure if the initial change was a bug fix or introducing a possible bug; separating concerns so this PR is a feature introduction, the other change can be done separately.