With the amendment that against Conflux on templates where it plays randomly by the rules, you will be able to choose.
And if we're fixing Necropolis too, then why aren't we touching the Champion's Dungeon?
It seems to me that this amendment is unnecessary.