Revert "no ammo fix (possibly)"

This reverts commit 37ca3a746088d7657a7ce3a6db99539f9d8c0cd3.
Proper no ammo fix