Reset this whole file. This is done on master already.