This commit caused the register allocator to fail on i386. This reverts commit d8abf85f and 04dd7cb3 (the second being a fix to the first).