Backed out changeset fd1fc08e3f58 (bug 948743) for B2G test failures.