While looking at MB-27841, I realised that I had fix this very issue in MB-27496, which is when I notice that there was some code (rest.go) duplication between the two repos.
We should check:
MB-41214 Replace docloader with cbimport