[mgunnett]

The solution I think the SB team would support at this time is the one I listed as it does not involve changing any of the core files. But indeed, whatever works for you.