openocd: lost change from my cherry-picking