restore some redundant changes