Resolve #3526044 "Di antipattern"

Ankit Pathakrequested to merge
issue/acquia_optimize-3526044:3526044-di-antipattern into 1.x

Closes #3526044

Merge request reports