Or at least keep it out of this PR. Can exterminate later.