CS2 - I want to turn off active layer changing when undoing/redoing

In CS2 if you change your active layer and perform an action in it (paint a brushstroke, etc.) then undo it, your active layer switches back to the previous one before you made your change. I don't believe this was present in previous versions of Photoshop, but I've yet to find a situation where it helps me. Rather, I find I don't realize it has changed layers and end up painting or working in the unintended layer.
I was hoping someone knew of some way to turn this off so it works the old way from CS and before. Every artist at my company would be very grateful.
Thanks!

There's no way to do what you want to do, as far as I know.

Many others have complained about this as well, for quite a few versions now.