Remove GFS workaround.