Remove redudant code

Fixes bug 1102402

Change-Id: Ib4a226cdc18506c1aa08707cc06fa76d4090287f