Opened #731 for this.