Import from original add-on version.