Revert 6b28c06..98fd381

This rolls back to commit 6b28c06b2c6401d7a54a2df4e2f329b948acd7ed.
Feature 1154 & 73: NPCs react to crime