Revert "Fix return error"

This reverts commit 3be4ebb025c6a21547aec7bb79c144a8b000bc46.

Reason for revert: crash on Vega on oc-dr1-daydream-dev branch

Change-Id: I939c87ca66ad62dbeb8b696c08a2d539180dfe7c
2 files changed