Backing out bug 850336 due to test timeouts. r=backout