Revert "HACK... https://bugzilla.samba.org/show_bug.cgi?id=12892"