Fix post-processing changes from merge.