Revert "Modify fixup_cattrs () to handle a corner case where a cattr is created using...