Bug #1995: Fix bad merge
(cherry picked from commit ecd220a55e0ab2c34573b9fabc9757688ea6a46b)