roll back GFV for now