Move RIP back to packages. It fixes #2810