Back out efdf2d801664 (bug 881128) for disregarding the DANGER of not dealing with test_interfaces.html