This reverts a hunk of commit 4b29631d
which seems to have been an accident, and which re-introduced a
previously fixed bug.
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>