Somehow r663, which contained a fix for 64bit, got checked in as a null change