Way to take power cells out of items

[Lady Birb]

After the materials revamp, there is currently no way to take power cells out of Guns, batons, or other items that use them. This has the side effect of making it nigh-impossible to complete the antique laser as a non-traitor as the only ways I know of off the top of my head to get small power cells that aren't already in a weapon is from the merchant at the listening post or from surplus crates.
There is a simple fix to this: Have small power cell removal be the same as removing modules from PDA's, unscrew the panel then crowbar it out.
Oh and while we are on the topic: The materials revamp also removed craftable cells. Could we get those back at some point?