Opened #903 to handle this.