Also: note I'm not very happy with the idea of just passing a flag in because I'm not sure how that really solves the problem, it just pushes it back a layer to another part of the code that has to decide what to pass in. But we can worry about that later, because as I said, I suggest we leave the naive solution for now, as long as it's appropriately refactored right now.