Created #688 for this.