Reverted back to old 32/64Bit handling on Windows