Revert "r214897 - Remove dead zero store to calloc initialized memory"