Backout bug 833877 due to B2G test failures.