Remove workaround for bug 5700