Fixed by check-in [89d100b845]