yet more upstream changes