I wonder if we should just revert that "RI 6 compatibility" commit?

ttyl
bero