When R&R'ing that front blade on the 617:

Be absolutely sure to support the area surrounding the sight retaining pin (side facing down), when driving that pin with a drift punch.

It's also a good idea to mask the driven side, to protect it from possible misdirected drift punch marks.