Revert "G3D update"

This reverts commit 5dc5474003db0dada2d78bc0c8812c11198846d0.