Restore some un-checked-in changes