Revert my last two patches to LVI, which recent changes have exposed a miscompilation in.