This reverts commit 8963332c. There was a logic bug typo in this code, but it wasn't visible in the asm for the tests.