Oops, this return was misplaced

Change-Id: Iaffbdcb9dbed50cdeb4ab9d4a6cb49c1193f3eda