Fixed last patch I853496a860742ba906b756b26f4c13b51bacb82f

Removed duplicate returns

Change-Id: I3bac0cd2bc9423972c608bfc86bb15ccb3e4b4d7