This is a follow-up to 8266a369



Bug #694957

Signed-off-by: Francois Marier <francois@catalyst.net.nz>