This effectively revertsfa6f37c043just for TEST-04, as we nuke the journal repeatedly in this test which makes it particularly hard to debug. Let's hope the issue behindfa6f37c043won't bite us back in this case. Follow-up for:fa6f37c043Reverts:8f7c876bdc