Sorry: even though half of the tests pass, I did not preserve one check
with the last patch and it better be preserved just to be safe: