Adding CustomField into the list of unsets, was causing default setup updates to fail.