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

This reverts commit bab150d79c7b9b1f233fc3592b69a42f0b38fbd8.