2.91.08 Revert merge gfx/common