Recents topmost fix -- Holy redundant code, batman

Change-Id: I2a53872dc4a9e0c09a2a3d339a153f4b906f4440