I'm going to push this off to a later PR. I don't remember what we decided.