Revert "Autowiring a drobny refactoring"

This reverts commit f6bc6cd10d9b67dae6ef19f220b86c31617d0c6b.