Revert ""Zero as null pointer constant" warnings fixed"

This reverts commit c77175cd.

The wrong commit was caused by a missing rebase. The changes
were already committed with the previous patch.