Revert a rather careless test breakage