[BZ 1069547] Fix merge issue.