Bug 1111564 - Backout 10692972a7b6 (bug 1084177) for increasing memory usage. r=me