Import: Fix importing FW 2.1+ data back to FW 2.1+