temporarily reverting quiver changes to fix armor-related crashes