Revert nvi brokenness AGAIN.