Revert "captivity was switched to its own module it seems, just reflecting this change"

This reverts commit 738e03c35ac042118cdc5e0f3058f7d3b25f2333.