remove workaround for bug 5317