Backout a8edc81c39d5 for causing an increased number of intermittent bug 1059238. a=bustage