Revert d8e6e2e23b0010618c49126d6bfa6eef62b66a83
Merge pull request #1126 from sjinks/memory

Revert d8e6e2e23b0010618c49126d6bfa6eef62b66a83