Fix merge error between previous two commits.