Re-enable logic to prevent delivery of zero items

This capability seems to have been removed in commit 6a72ef0.