A fix for a fix in ea866a633.