Attempt to fix the build after r230921