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