Fixes #862
I am sure this will result in someone whining for wall banning as well, but that can wait another couple of months.