Revert "Merge pull request #3445 from petraselmer/null-case"

This reverts commit ca1dde385209043ac25ab65fbe4ee2072385c83f, reversing
changes made to 3d722bc57520c498d62bf24e6074f023eb4824af.