This reverts commit eff1369cab. This was in a working branch and I only intended to commit exception.c. But I committed the exact inverse. Sorry.
eff1369cab