Remove patches to write-protect TrackStateOnSurface memory. The underlying problem has been solved, and these changes affect performance.
This reverts commit 79eaff60. This reverts commit ce1dae71.