I don't think so. I used to do the Leupold custom shop orders for OP in my past life...and actually did some of those because of it not being factory.
As you already mentioned, the custom shop can do the switch, wasn't too long a turnaround time either as I remember.
