Revert "Use type comparison for null comparison as well where used, so empty results are not equilavent to null anymore"

This reverts commit c849790977efe1558f19bceb6cf9497322725cb3.