Revert "Trebuchet - Custom Dynamic Grid Columns & Rows patch"

This reverts commit deadc2a30928f091fb5e983afb7937f5d37e7e48.