This reverts commit 07106959.

This reverts commit f5e7cc2e.

This actually makes us slightly slower, due to increased register pressure, but I think if I can alleviate that we'll see a speedup.

Almost fast enough.. just 1.3ms more to shave off per frame.