samba36: revert r40341