Back out bc8eeacc3c8a (bug 843893) for (at least) desktop bustage in test_power_basics.html