Basically, they've put the cops in a box by taking away the other reliable weapon they had; now the cop is left with the gun.
Exactly. Remove all non-lethal and see what happens. Re-imagine police funding and see what happens.