If you want to change it and you have a better idea, please implement it and submit the patch and it will be considered. Yeah the old mechanism was "simpler and less correct",
What about if you leave the old one (which was used before Brian's update) as optional?
e.g. users could fallback to that one if that's what they feel is "simpler" for them and they don't need all of the domain management magic