Reduce compatibility issues e.g. on Mac. The previous versions
are not working well anyway.

Change-Id: If6cc7c1d4a85300d9bf054966216b52b35c0d1f2
Reviewed-by: hjk <hjk121@nokiamail.com>