Finally putting it back how it was before Keith got at it -- yay :)
Signed-off-by: David Woodhouse <dwmw2@infradead.org>