Revert "Saving a couple of mallocs"

This reverts commit 57ded0c5459300b77d28ba81662a05d88f74cb85.