[rfpkg/f37] Fix for rpkg-1.65 change