Fix the build after [bb8c246]. Botched hand merging of the patch.