Revert "Merge branch 'jag/modules-clean-reprovision'"

This reverts commit b54bdc0938db65c1b815b84250ee817cc8445150, reversing
changes made to c8708da2a124396674cfb6ccbacd78bbcf8d6139.

Conflicts:
	main/samba/ChangeLog