We are having the same problem as well. I hope this will be resolved so that we don't have to hack the PHP files when we roll out the upgrade on our live site. If it's causing problems for this many customers, maybe it's something worth calling a bug, not a feature.
