Bug #1995: Fix bad merge