Adding --no-bin-links option as a workaround for #2380