Fix a GCC build failure from r223802