Revert bugfix to async previous behaviour

Change-Id: If87cb02d535c44f6dcbc4600b6e1d505bd336b53