Revert "Missing deps"

This reverts commit df68b3b47ad2d7f15be52d5d725c993649b7baf2.
Revert "Try to get rid of a lambda..."

This reverts commit 63226f8088930ef6fe0ffefe1fb515996e9f40bb.