Revert addition of UpdateOrCreateMixin; reaches 100% test coverage.