Loadout swap

I really enjoyed the fact that you can swap your loadout with one om the ground, but i feel like the system could be abused: I happened to be an engineer on a game, running around hitting tanks with rpg, when I found a support kit on the ground, i swapped it dropped the supply bag, then swapped again to my engineer kit that was on the ground, giving myself 6 new rpg rockets. I think this could be spammed/exploited with someone on a recon class that puts a beacon then redeploys as medic then engineer to have infinite rpg rockets while camping. I would suggest only swapping weapons and not gadgets when picking up a kit from the ground to remedy the problem. On top of that, maybe disallow kit swapping when a player is still waiting for a revive? I did swap my kit a lot of times by mistake trying to revive a teammate, and we both unwillingly ended up with each other's kit.