We've switched to using the `@six.add_metaclass` decorator