Fixes re: CL20440, per stadler's comments
1 file changed