Revert "Reduced memory consumption."

This reverts commit bd74a78f0ec0b1707e74424f26f010614ee89302.