Revert "Merge pull request #551 from pekabon/NotNullOrEmpty2"

This reverts commit a557215fb34b5b6e5c0ed16b0b31ef98ddc1f30d, reversing
changes made to a126cddff12ea4d3ae1b90d91c16cb4e83a805e0.