revert import six deletions