Revert "Temporary revert API DI"

This reverts commit 8a3dcf3ed9b8e772bf45157910745d093b574254.