Opened #5128 for this.