Revert "Allowing for soft-delete constraints other than IS NOT NULL"

This reverts commit 2c17792edd0ab499775089618964c3d1822e3980.