Revert "Multiple GL_ TRIANGLE_ STRIP draw merge."
Sorry, too quick there. Drawing this as one big tri-strip adds extra triangles between the cube sides. It could be done with one draw call using index buffers and primitive restart, but it's probably better to keep things simple.
This reverts commit 2418cfe7