This is in line with what other OS clients do. Fixes: bug #1160689 Change-Id: Icbf053bd93ecdbeeb2ea791c32199225803d09be