I think the munging is a good idea regardless of this bug report.