Remove the workaround for bug 11399 now that it is fixed.