This reverts commit e296c137.
@bardiharborow: @Johann-S noticed that the browser tests don't run in the PRs now. Since I don't know when you might be able to have a look, I make the PR to merge so that we have tests and we can look into it again in the future. :)