I'm going to raise a separate issue for this so that we don't lose this.