Picaro: Temporary bug fixes

Revert patch while we work to fix a bug with weapons.