r17145: revert a greedy merge from SAMBA_3_0