Fixes the root cause for the crashes in vcldemo and ui-previewer that
indirectly were fixed by 0b7631bc and
f5cfed29. Those two commits are now reverted.

Change-Id: If5dac37f032d2b74c977562c339e9799bbc4454c