Don't force the build to 32-bit.

FIXME: clean up the stuff that says it should be cleaned up.