Remove code that does nothing

Seems to have sneaked in during I7588246bbdaa90be221d7cb531373eb5b1233bf2

Change-Id: Idfcd6d3ceead528d73aeaae0b190cc3c4256adc1
Merge "Remove code that does nothing"