Revert the part of 66f1fe82f77fded6a9974d7573490ca379957c7b which was
unrelated to samba