So both ways mentioned above don’t work for you? For me the reimporting fixed it. You might want to try to do that as cleanly as possible in a few ways, see if that can somehow help.
Otherwise for a temporary solution you could always import them in 4.16 and send them over to 4.17, although it’s not preferable of course…