Fix broken acceptance tests, including again a line of code that had been deleted by mistake in commit 3afa63699dade8e2ab96ac35fc1c749d9e6bd36b.