This is vestigal. Removing it to make reviewing xenialification easier. Change-Id: I9b57336d47ee4aa18fdc3888c2ac2c75a3b23c15