Revert "Improved handling of 0 initializations (#4604)"

This reverts commit 1201e417ec568fde523a6a751415eb06778b833a.
Now really fixed #4604.