FWIW I've had a few times now where the only way to get CM to screw its gard back on right was to open the faulty/by faulty assets for edit and then revert them to original.

THEN it finally gets...