Remove fix for #5509