Fixed by check-in [dec4685720199]