[#63016052] Temporary bug fix for data migration ONLY.