IIRC, this was actually the change that made me decide centralizing the shimming code was the right way to go because I had to use the same shim in both locations.

I'm not sure many/any of the other shims had to do that.