Undoing all those changes, it was good as it was