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