Revert "no more manual arguments for di functions"

This reverts commit d677cdac308fe5aa73ead1b218df1212561afbd5.