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