I suggest temporarily removing this because it has been causing some issues so far. I will add some more elaborate tests to make sure it works reliably before we revert the change
Required !682 (merged)