Merge "another bug introduced by some previous refactoring CL"