Follow-up r76633: change function signature so that it's easier to track the problem