Revert "Merge branch '213382-use-not-valid-to-immediately-enforce-a-not-null-constraint' into 'master'"

This reverts commit b2535a90, reversing
changes made to 5b50e78a.