Somehow, this got dropped when I applied extra-patch-inherit-interp_prefix