Can we separate this from this PR, though? I don't really want to try to understand the implications of this change right now.