Revert "Bugfix on Police logic"

This reverts commit 68a6ec93c7e33feeb13d11162414bae8a4b7eadb.