This is essentially a revert of c7ad0200. Indeed, it seems that both 96dbdd75 and c7ad0200 were committed, but c7ad0200 seems to be only an older version of 96dbdd75's tests.