Back port CA-137319 to xs64bit.