This reverts commit b94b58f.
The wptrunner changes are not quite right and causes Python exceptions
inside the test haness.