Revert "All depencency checks in the same block refs #24"

This reverts commit ec8aa0bec5c7441686b0dedbd916aa8e2e1316c1.