Return immediately

Change-Id: Id42e4f2bda840aa0d8341bdedceb98bcfebe9174