Revert "Hm, and without dependencies?"

This reverts commit 10264eb8ca46d0234af73e5ff90acb6f5066ee9a.
And with only one?