Backing out bug 829428 due to bustage. r=bustage CLOSED TREE