Revert "Populate module_setup from the setup module rather than special code elsewhere"

This reverts commit 58eec2e4c22c800f1d8a68f0345f2872ece9c6e4.
Update setup module signature from merge commit.