Revert "Avoid zero size array warning"

This reverts commit d4fd57aae976f36a4f235e1e8358f6c5c1ad6d98.