This patch doesn't necessarily require the config option stuff.  I can add that later.  I still haven't decided about that.  What I may end up doing is hiding it behind a config option for Helium, and then defaulting to the new method for the next feature release after that.  I just don't want to blindside anyone with changes.