Try to fix an incompatibility with upstream changes