Revert "Revert "Revert "otasigcheck: Go back to the key-rewrite check."""

This reverts commit 59dfaf90cc23c74c00efb0fdbc442399ac919572.