r18688 fixes this problem. Close it.