Backed out changeset a9de76765bad on a CLOSED TREE from bug 850336 for its test taking too long.