Restores duplication to include FX dependency