Undo initial core changes