Revert "Merge pull request #2843 from mrobinson/tilegrid"

This is to test whether reverting these changes will cause the test failures to go away on the OS X builders. I always see the failures locally, but the bots only saw them after these changes.