I'll merge your PR so we get more exposure and review, but for the record, I'll remove this bit for now. I still feel it's wrong to do that -- if it turns out to be absolutely needed, we'll add it back.