Since this file only has reformatted imports, maybe we could reset it to what it is in master?