fix breakage caused by bug 1000917