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

This reverts commit 2f3a0b5d68bbb640e54f77922e25b408e4758150.