[c2464] Revert [z1818] make armor bonuses from certain items be unaffected by base armor mods