Our downstream changes to rpkg