Revert "Force build to be for 32bit only"

This reverts commit f18649b36012b0749d252fcaf8a8919d23d4512e.