Backport of:  http://patchwork.ozlabs.org/patch/860701/



Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>