Manually re-merging this.