This partially reverts commit 241c145226. It embarrassingly included Signal-Desktop changes/tests that it shouldn't and I somehow noticed it too late... :o Sorry!
241c145226