This reverts commit 91fc9b18

.

This patch got reverted because it broke the basiclayouts example on Mac OS.

However, the bug was in the basiclayouts example, so we can still add
this patch.

Change-Id: I97c3cf30dd5a5c97916b4811d8be0b5b5a7ebb4e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>