This reverts commit 31bb93846c, reversing changes made to 7940dd442b. Reverting because we can't upgrade jetted code without ensuring the jets change in lockstep.
31bb93846c
7940dd442b