Hey all, So, Im building my A2 upper and ordered my barrel and stockset... Barrel came today and to my surprise, it has the triangle handguard cap. My stocks have the round! I need to swap out the cap... However the front sight has been installed already... *Is it just a matter of driving out the pins, removing the FSB and swapping in the round cap.... then slide the FSB back on and tap the pins back in???????