Bug #1949: Prevent bug #1800 from reappearing