Remove "extras" again

It snuck back in here 82ad299a5fe893bffbd264f86965ed7a6c4181cf

Change-Id: I2562408591a4c3a4d6029869e1c1d48a6a433850
Merge "Remove "extras" again"