[rfpkg/f36] Fix for rpkg-1.65 change