Revert "Merge pull request #424 from smeranda/remove_old_grid"

This reverts commit 472d4f86b19e2a9796b02224d2b085b24b143f55, reversing
changes made to ee2f01c9e62e3fae7e8adac028a5fd8e326170c9.