Revert "Minor fix that increases the non-scrolling efficiency."

This reverts commit 71544d3cb9a9bcd5e88bf30b7f8905184f733b7f.
Revert "Enhancement to lazy tile deletion that skips segment optimization when tiletypes have not changed."

This reverts commit 04d84c9f8a21da22f96a17d245a51850e6386381.