Updated to apply over the latest g2r-basis-filename.diff patch.