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