WP-2606 Code changes for the import.