Revert "SIP valid() fix."

This reverts commit c5933c8b64c4515172a6a192166a41fa80e7c864.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Revert "SIP valid() fix."