Fixed by check-in [7a61aabf34].