Back out the previous change. It doesn't save any space on 64-bit

platforms.