[rfpkg/f35] Fix for rpkg-1.65 change