This commit was to debug #1275 (closed). I made the commit on the wrong branch, I wanted it to be on my debugging branch.
So now, this commit reverts the debugging commit which makes the tests fail.