Redoing this change.

Throughput is twice as high with this change.