Fix a build failure after the merge