Incorporated the g2r-basis-filename.diff changes so that we don't