Interested to see how you dealt with this one!
Haven't done anything yet; too much spring yard work plus repairs to my recently-acquired electric steeplecab locomotives (7.25" gauge: a bit big for this forum).
I'll be sure to get back to you all when I either succeed or fail.