So it turns out that a) this entire chapter now is either superfluous or contradicts the new plot, and b) this chapter is essential to the flow of the story. Awesome. Measuring twice to cut once.