Merge branch Mario/weapon_alias_fix (XS merge request)

Partially reverts one of the breaking changes merged immediately prior to 0.8.5's release, as seen in !457 (merged). The configuration changes are not needed as they existed for 0.8.1 clients.
Fixes #2714 (closed)