All the changes in this file look like leftovers. How about reverting them?