Fixed by checkin [51c849b483]