Deleting a custom data set does not update default dedupe rules

I deleted a custom data set which was used in the default matching rule and it did not alter the rule, so my contacts import failed as it could not find the relevant database tables.

In a possibly separate issue, I could not update the default rule to use different fields until I marked it as not default any more - the changes just didn't save and there were no errors.