This reverts commit cbb709e2 as it breaks the tests, which was not supposed to happen. Investigating now.