Remove double code, again

Change-Id: Ia0efb39116e0fb4d12393fb6098cd129164bdba3