Revert "Fix compatibility for custom weapon bases"

Just to avoid conflicts. It's now on the experimental branch.