Revert "Merge branch 'jkerihuel/samba-4.2.0-fix' into jkerihuel/indexing-sql"

This reverts commit 1b49accb25de93509c97e35f3901cdec7ef81903, reversing
changes made to 24f26352fafbcc5fcde77376635ef8a6147c0c48.