Removing vestigial logic, fixing issue 4412373

Change-Id: Ifd8420caf9f3d9ae49c19964233f86d0ed497455
2 files changed