BZ-0000: Fixing merge issue in recent commit.