r11710: fix build-twice-in-a-row