I actually don't think this is the answer, and I'll open a more explicit issue up for this.