Patch Set 1: Looks good to me, but someone else must approve; IP review completed

I think this fixes 308945, for now.  Its not the ideal solution, but the ideal solution is taking far too long for me to code.  I want to get the bug fixed before we release anything in the 0.8 series, and this seemed pretty simple as a workaround.