ForeignKeyConvention doesnt run when dependent entity type PK is changed

[maumar]

Before:

    public class LocustLeader
    {
        public string Name { get; set; }
        public short ThreatLevel { get; set; }
    }

    public class LocustCommander : LocustLeader
    {
        public LocustHorde CommandingFaction { get; set; }

        public string DefeatedByNickname { get; set; }
        public int? DefeatedBySquadId { get; set; }
        public Gear DefeatedBy { get; set; }
    }

    public abstract class Faction
    {
        public int Id { get; set; }
        public string Name { get; set; }

        public string CapitalName { get; set; }
        public City Capital { get; set; }
    }

    public class LocustHorde : Faction
    {
        public LocustCommander Commander { get; set; }
        public List<LocustLeader> Leaders { get; set; }

        public string CommanderName { get; set; }
        public bool? Eradicated { get; set; }
    }

and OnModelCreating:

modelBuilder.Entity<LocustHorde>().HasOne(h => h.Commander).WithOne(c => c.CommandingFaction);

would create a navigation: locustHorde.CommanderName -> locustLeader.Name

After adding (undelated) navigation to LocustCommander, the relationship is not defined as:
faction.Id -> locustLeader.CommandingFactionId

The new definition is worse because the navigation is declared on derived entity - LocustHorde and there is a matching FK (CommanderName)