Fixed on branch via check-in [c93b891f69483b69].