Even with drowning gone this is just leading to people luring citizens to kill 1 by 1, a tedious but very efficient source of experience and items.  Keeping classes on townsfolk is always going to create warped incentives and on top of it is just weird.