The gun's back in but only for C of G / controllability and the expense of fly-by-wire software rewrite. The last I heard from the IPT was that the barrel would have a hole drilled through it to disable it but that the armaments engineers were still insisting that it be serviced at normal intervals even though it would just be very expensive ballast.
If I am wrong please issue the good news.