Revert "Fix gr3d_t30"

This reverts commit c1d6e6ca7e1100ed843375bab9cd603421305d73.