Backout commit 289e653a7061 for bug 995704 - potential perf regression.